2020-10-29 09:06:35

by Coiby Xu

Subject: [PATCH 1/3] ACPI: watchdog: remove unnecessary CONFIG_PM_SLEEP

SET_NOIRQ_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.

Signed-off-by: Coiby Xu <[email protected]>
---
drivers/watchdog/wdat_wdt.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
index 3065dd670a18..0d912ceb2ecd 100644
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
@@ -465,7 +465,6 @@ static int wdat_wdt_probe(struct platform_device *pdev)
return devm_watchdog_register_device(dev, &wdat->wdd);
}

-#ifdef CONFIG_PM_SLEEP
static int wdat_wdt_suspend_noirq(struct device *dev)
{
struct wdat_wdt *wdat = dev_get_drvdata(dev);
@@ -526,7 +525,6 @@ static int wdat_wdt_resume_noirq(struct device *dev)

return wdat_wdt_start(&wdat->wdd);
}
-#endif

static const struct dev_pm_ops wdat_wdt_pm_ops = {
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq,
--
2.28.0

2020-10-29 09:07:21

by Coiby Xu

Subject: [PATCH 3/3] watchdog: sirfsoc_wdt: remove unnecessary CONFIG_PM_SLEEP

SIMPLE_DEV_PM_OPS has already took good care of CONFIG_PM_CONFIG.

Signed-off-by: Coiby Xu <[email protected]>
---
drivers/watchdog/sirfsoc_wdt.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
index 734cf2966ecb..dc8341cd7d44 100644
--- a/drivers/watchdog/sirfsoc_wdt.c
+++ b/drivers/watchdog/sirfsoc_wdt.c
@@ -170,7 +170,6 @@ static int sirfsoc_wdt_probe(struct platform_device *pdev)
return 0;
}

-#ifdef CONFIG_PM_SLEEP
static int sirfsoc_wdt_suspend(struct device *dev)
{
return 0;
@@ -189,7 +188,6 @@ static int sirfsoc_wdt_resume(struct device *dev)

return 0;
}
-#endif

static SIMPLE_DEV_PM_OPS(sirfsoc_wdt_pm_ops,
sirfsoc_wdt_suspend, sirfsoc_wdt_resume);
--
2.28.0

2020-10-29 13:06:26

by Guenter Roeck

Subject: Re: [PATCH 1/3] ACPI: watchdog: remove unnecessary CONFIG_PM_SLEEP

On 10/29/20 12:53 AM, Coiby Xu wrote:
> SET_NOIRQ_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>
Not really.

> Signed-off-by: Coiby Xu <[email protected]>
> ---
> drivers/watchdog/wdat_wdt.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
> index 3065dd670a18..0d912ceb2ecd 100644
> --- a/drivers/watchdog/wdat_wdt.c
> +++ b/drivers/watchdog/wdat_wdt.c
> @@ -465,7 +465,6 @@ static int wdat_wdt_probe(struct platform_device *pdev)
> return devm_watchdog_register_device(dev, &wdat->wdd);
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int wdat_wdt_suspend_noirq(struct device *dev)

You would have to add __maybe_unused here for this to work as intended.

Guenter

> {
> struct wdat_wdt *wdat = dev_get_drvdata(dev);
> @@ -526,7 +525,6 @@ static int wdat_wdt_resume_noirq(struct device *dev)
>
> return wdat_wdt_start(&wdat->wdd);
> }
> -#endif
>
> static const struct dev_pm_ops wdat_wdt_pm_ops = {
> SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq,
>

2020-10-29 13:09:29

by Guenter Roeck

Subject: Re: [PATCH 3/3] watchdog: sirfsoc_wdt: remove unnecessary CONFIG_PM_SLEEP

On 10/29/20 12:53 AM, Coiby Xu wrote:
> SIMPLE_DEV_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>
> Signed-off-by: Coiby Xu <[email protected]>
> ---
> drivers/watchdog/sirfsoc_wdt.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
> index 734cf2966ecb..dc8341cd7d44 100644
> --- a/drivers/watchdog/sirfsoc_wdt.c
> +++ b/drivers/watchdog/sirfsoc_wdt.c
> @@ -170,7 +170,6 @@ static int sirfsoc_wdt_probe(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int sirfsoc_wdt_suspend(struct device *dev)

And again: __maybe_unused

I would suggest to test compile the code with CONFIG_PM_SLEEP disabled.

> {
> return 0;
> @@ -189,7 +188,6 @@ static int sirfsoc_wdt_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> static SIMPLE_DEV_PM_OPS(sirfsoc_wdt_pm_ops,
> sirfsoc_wdt_suspend, sirfsoc_wdt_resume);
>

2020-10-29 14:36:02

by Coiby Xu

Subject: Re: [PATCH 3/3] watchdog: sirfsoc_wdt: remove unnecessary CONFIG_PM_SLEEP

On Thu, Oct 29, 2020 at 06:05:21AM -0700, Guenter Roeck wrote:
>On 10/29/20 12:53 AM, Coiby Xu wrote:
>> SIMPLE_DEV_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>>
>> Signed-off-by: Coiby Xu <[email protected]>
>> ---
>> drivers/watchdog/sirfsoc_wdt.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
>> index 734cf2966ecb..dc8341cd7d44 100644
>> --- a/drivers/watchdog/sirfsoc_wdt.c
>> +++ b/drivers/watchdog/sirfsoc_wdt.c
>> @@ -170,7 +170,6 @@ static int sirfsoc_wdt_probe(struct platform_device *pdev)
>> return 0;
>> }
>>
>> -#ifdef CONFIG_PM_SLEEP
>> static int sirfsoc_wdt_suspend(struct device *dev)
>
>And again: __maybe_unused
>
>I would suggest to test compile the code with CONFIG_PM_SLEEP disabled.

I will test it before send v2! Thank you for the feedback!
>
>> {
>> return 0;
>> @@ -189,7 +188,6 @@ static int sirfsoc_wdt_resume(struct device *dev)
>>
>> return 0;
>> }
>> -#endif
>>
>> static SIMPLE_DEV_PM_OPS(sirfsoc_wdt_pm_ops,
>> sirfsoc_wdt_suspend, sirfsoc_wdt_resume);
>>
>

--
Best regards,
Coiby