watchdog: st_lpc_wdt: Remove #ifdef guards for PM related functions
authorPaul Cercueil <paul@crapouillou.net>
Tue, 28 Jun 2022 19:34:47 +0000 (20:34 +0100)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Sat, 23 Jul 2022 12:21:26 +0000 (14:21 +0200)
Use the new DEFINE_SIMPLE_DEV_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@crapouillou.net>
Cc: Patrice Chotard <patrice.chotard@foss.st.com>
Cc: linux-arm-kernel@lists.infradead.org
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220628193449.160585-7-paul@crapouillou.net
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/st_lpc_wdt.c

index 14ab655..39abecd 100644 (file)
@@ -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,16 +284,14 @@ static int st_wdog_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
-static SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
-                        st_wdog_suspend,
-                        st_wdog_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
+                               st_wdog_suspend, st_wdog_resume);
 
 static struct platform_driver st_wdog_driver = {
        .driver = {
                .name = "st-lpc-wdt",
-               .pm = &st_wdog_pm_ops,
+               .pm = pm_sleep_ptr(&st_wdog_pm_ops),
                .of_match_table = st_wdog_match,
        },
        .probe = st_wdog_probe,