diff mbox series

[2/3] watchdog: st_lpc_wdt: remove unnecessary CONFIG_PM_SLEEP

Message ID 20201029075327.228570-2-coiby.xu@gmail.com (mailing list archive)
State Changes Requested
Headers show
Series [1/3] ACPI: watchdog: remove unnecessary CONFIG_PM_SLEEP | expand

Commit Message

Coiby Xu Oct. 29, 2020, 7:53 a.m. UTC
SIMPLE_DEV_PM_OPS has already took good care of CONFIG_PM_CONFIG.

Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
---
 drivers/watchdog/st_lpc_wdt.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Patrice CHOTARD Oct. 29, 2020, 7:58 a.m. UTC | #1
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 <coiby.xu@gmail.com>
> ---
>  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 <patrice.chotard@st.com>

Thanks

Patrice
Guenter Roeck Oct. 29, 2020, 1:03 p.m. UTC | #2
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 <coiby.xu@gmail.com>
> ---
>  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,
>
Patrice CHOTARD Oct. 29, 2020, 1:13 p.m. UTC | #3
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 <coiby.xu@gmail.com>
>> ---
>>  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 <patrice.chotard@st.com>
>
> Thanks
>
> Patrice
>
Coiby Xu Oct. 29, 2020, 2:51 p.m. UTC | #4
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 <coiby.xu@gmail.com>
>> ---
>>  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 <patrice.chotard@st.com>
>
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
diff mbox series

Patch

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,