2020-10-29 09:05:26

by Coiby Xu

Subject: [PATCH 2/3] watchdog: st_lpc_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/st_lpc_wdt.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
index 14ab6559c748..c1428d63dc9e 100644
--- a/drivers/watchdog/st_lpc_wdt.c
+++ b/drivers/watchdog/st_lpc_wdt.c
@@ -248,7 +248,6 @@ static int st_wdog_remove(struct platform_device *pdev)
return 0;
}

-#ifdef CONFIG_PM_SLEEP
static int st_wdog_suspend(struct device *dev)
{
struct st_wdog *st_wdog = watchdog_get_drvdata(&st_wdog_dev);
@@ -285,7 +284,6 @@ static int st_wdog_resume(struct device *dev)

return 0;
}
-#endif

static SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
st_wdog_suspend,
--
2.28.0

2020-10-29 09:07:50

by Patrice CHOTARD

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

Hi Coiby

On 10/29/20 8: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/st_lpc_wdt.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
> index 14ab6559c748..c1428d63dc9e 100644
> --- a/drivers/watchdog/st_lpc_wdt.c
> +++ b/drivers/watchdog/st_lpc_wdt.c
> @@ -248,7 +248,6 @@ static int st_wdog_remove(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int st_wdog_suspend(struct device *dev)
> {
> struct st_wdog *st_wdog = watchdog_get_drvdata(&st_wdog_dev);
> @@ -285,7 +284,6 @@ static int st_wdog_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> static SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
> st_wdog_suspend,

Reviewed-by: Patrice Chotard <[email protected]>

Thanks

Patrice

2020-10-29 13:07:28

by Guenter Roeck

Subject: Re: [PATCH 2/3] watchdog: st_lpc_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/st_lpc_wdt.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
> index 14ab6559c748..c1428d63dc9e 100644
> --- a/drivers/watchdog/st_lpc_wdt.c
> +++ b/drivers/watchdog/st_lpc_wdt.c
> @@ -248,7 +248,6 @@ static int st_wdog_remove(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int st_wdog_suspend(struct device *dev)

Again, this requires __maybe_unused.

> {
> struct st_wdog *st_wdog = watchdog_get_drvdata(&st_wdog_dev);
> @@ -285,7 +284,6 @@ static int st_wdog_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> static SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
> st_wdog_suspend,
>

2020-10-29 13:18:02

by Patrice CHOTARD

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

Hi Coiby

As already pointed by Fabrice Gasnier for similar patch "[PATCH 10/15] iio: adc: stm32: remove unnecessary CONFIG_PM_SLEEP"

When compiling with W=1 and CONFIG_PM_SLEEP disabled, we got the following warnings:

drivers/watchdog/st_lpc_wdt.c:265:12: warning: ‘st_wdog_resume’ defined but not used [-Wunused-function]
  265 | static int st_wdog_resume(struct device *dev)
      |            ^~~~~~~~~~~~~~
drivers/watchdog/st_lpc_wdt.c:251:12: warning: ‘st_wdog_suspend’ defined but not used [-Wunused-function]
  251 | static int st_wdog_suspend(struct device *dev)
      |            ^~~~~~~~~~~~~~~

Can you add missing "__maybe unused"  attribute ?

Thanks

Patrice

On 10/29/20 8:58 AM, Patrice CHOTARD wrote:
> Hi Coiby
>
> On 10/29/20 8: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/st_lpc_wdt.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
>> index 14ab6559c748..c1428d63dc9e 100644
>> --- a/drivers/watchdog/st_lpc_wdt.c
>> +++ b/drivers/watchdog/st_lpc_wdt.c
>> @@ -248,7 +248,6 @@ static int st_wdog_remove(struct platform_device *pdev)
>> return 0;
>> }
>>
>> -#ifdef CONFIG_PM_SLEEP
>> static int st_wdog_suspend(struct device *dev)
>> {
>> struct st_wdog *st_wdog = watchdog_get_drvdata(&st_wdog_dev);
>> @@ -285,7 +284,6 @@ static int st_wdog_resume(struct device *dev)
>>
>> return 0;
>> }
>> -#endif
>>
>> static SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
>> st_wdog_suspend,
> Reviewed-by: Patrice Chotard <[email protected]>
>
> Thanks
>
> Patrice
>

2020-10-29 14:56:12

by Coiby Xu

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

On Thu, Oct 29, 2020 at 07:58:30AM +0000, Patrice CHOTARD wrote:
>Hi Coiby
>
>On 10/29/20 8: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/st_lpc_wdt.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
>> index 14ab6559c748..c1428d63dc9e 100644
>> --- a/drivers/watchdog/st_lpc_wdt.c
>> +++ b/drivers/watchdog/st_lpc_wdt.c
>> @@ -248,7 +248,6 @@ static int st_wdog_remove(struct platform_device *pdev)
>> return 0;
>> }
>>
>> -#ifdef CONFIG_PM_SLEEP
>> static int st_wdog_suspend(struct device *dev)
>> {
>> struct st_wdog *st_wdog = watchdog_get_drvdata(&st_wdog_dev);
>> @@ -285,7 +284,6 @@ static int st_wdog_resume(struct device *dev)
>>
>> return 0;
>> }
>> -#endif
>>
>> static SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
>> st_wdog_suspend,
>
>Reviewed-by: Patrice Chotard <[email protected]>
>
Thank you for reviewing the patch and giving the credit despite
the compiling issue with CONFIG_PM_SLEEP disabled as pointed by
Guenter and others:)

>Thanks
>
>Patrice

--
Best regards,
Coiby