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

Message ID 20201029075327.228570-3-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.
SIMPLE_DEV_PM_OPS has already took good care of CONFIG_PM_CONFIG.

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

Comments

Guenter Roeck Oct. 29, 2020, 1:05 p.m. | #1
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/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);

>
Coiby Xu Oct. 29, 2020, 2:30 p.m. | #2
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 <coiby.xu@gmail.com>

>> ---

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

Patch

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);