Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-24 14:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: st_lpc_wdt: Remove #ifdef guards for PM related functions

Browse Source 
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>
This commit is contained in:
Paul Cercueil 2022-06-28 20:34:47 +01:00 committed by Wim Van Sebroeck
parent 5c040ea210
commit 29958ab702
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/watchdog/st_lpc_wdt.c
View File

@ -248,7 +248,6 @@ static int st_wdog_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int st_wdog_suspend(struct device *dev) static int st_wdog_suspend(struct device *dev)
{ {
struct st_wdog *st_wdog = watchdog_get_drvdata(&st_wdog_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; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(st_wdog_pm_ops, static DEFINE_SIMPLE_DEV_PM_OPS(st_wdog_pm_ops,
st_wdog_suspend, st_wdog_suspend, st_wdog_resume);
st_wdog_resume);
static struct platform_driver st_wdog_driver = { static struct platform_driver st_wdog_driver = {
.driver = { .driver = {
.name = "st-lpc-wdt", .name = "st-lpc-wdt",
.pm = &st_wdog_pm_ops, .pm = pm_sleep_ptr(&st_wdog_pm_ops),
.of_match_table = st_wdog_match, .of_match_table = st_wdog_match,
}, },
.probe = st_wdog_probe, .probe = st_wdog_probe,