[PATCH 5/8] watchdog: sama5d4_wdt: Remove #ifdef guards for PM related functions

[Guenter Roeck]

On Tue, Jun 28, 2022 at 08:34:46PM +0100, Paul Cercueil wrote:
> Use the new LATE_SYSTEM_SLEEP_PM_OPS() and pm_sleep_ptr() macros to
> handle the .suspend/.resume callbacks.
> 
> These macros allow the suspend and resume functions to be automatically
> dropped by the compiler when CONFIG_SUSPEND is disabled, without having
> to use #ifdef guards. Not using #ifdef guards means that the code is
> always compiled independently of any Kconfig option, and thanks to that
> bugs and regressions are easier to catch.
> 
> Signed-off-by: Paul Cercueil <paul at crapouillou.net>
> Cc: Nicolas Ferre <nicolas.ferre at microchip.com>
> Cc: Alexandre Belloni <alexandre.belloni at bootlin.com>
> Cc: Claudiu Beznea <claudiu.beznea at microchip.com>
> Cc: linux-arm-kernel at lists.infradead.org

Reviewed-by: Guenter Roeck <linux at roeck-us.net>

> ---
>  drivers/watchdog/sama5d4_wdt.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
> index ec20ad4e534f..aeee934ca51b 100644
> --- a/drivers/watchdog/sama5d4_wdt.c
> +++ b/drivers/watchdog/sama5d4_wdt.c
> @@ -339,7 +339,6 @@ static const struct of_device_id sama5d4_wdt_of_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match);
>  
> -#ifdef CONFIG_PM_SLEEP
>  static int sama5d4_wdt_suspend_late(struct device *dev)
>  {
>  	struct sama5d4_wdt *wdt = dev_get_drvdata(dev);
> @@ -366,18 +365,17 @@ static int sama5d4_wdt_resume_early(struct device *dev)
>  
>  	return 0;
>  }
> -#endif
>  
>  static const struct dev_pm_ops sama5d4_wdt_pm_ops = {
> -	SET_LATE_SYSTEM_SLEEP_PM_OPS(sama5d4_wdt_suspend_late,
> -			sama5d4_wdt_resume_early)
> +	LATE_SYSTEM_SLEEP_PM_OPS(sama5d4_wdt_suspend_late,
> +				 sama5d4_wdt_resume_early)
>  };
>  
>  static struct platform_driver sama5d4_wdt_driver = {
>  	.probe		= sama5d4_wdt_probe,
>  	.driver		= {
>  		.name	= "sama5d4_wdt",
> -		.pm	= &sama5d4_wdt_pm_ops,
> +		.pm	= pm_sleep_ptr(&sama5d4_wdt_pm_ops),
>  		.of_match_table = sama5d4_wdt_of_match,
>  	}
>  };
> -- 
> 2.35.1
>