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

Message ID 20201029075327.228570-1-coiby.xu@gmail.com
State New
Headers show
Series
  • [1/3] ACPI: watchdog: remove unnecessary CONFIG_PM_SLEEP
Related show

Commit Message

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

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

Comments

Patrice CHOTARD Oct. 29, 2020, 7:58 a.m. | #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:02 p.m. | #2
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 <coiby.xu@gmail.com>

> ---

>  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,

>
Guenter Roeck Oct. 29, 2020, 1:03 p.m. | #3
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. | #4
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. | #5
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

Patch

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,