iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Use the new NOIRQ_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@crapouillou.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220628193449.160585-9-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:49 +01:00 committed by Wim Van Sebroeck
parent c1eaa8c559
commit 5f02d033f3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/watchdog/wdat_wdt.c
View File

@ -467,7 +467,6 @@ static int wdat_wdt_probe(struct platform_device *pdev)
return devm_watchdog_register_device(dev, &wdat->wdd); return devm_watchdog_register_device(dev, &wdat->wdd);
} }
#ifdef CONFIG_PM_SLEEP
static int wdat_wdt_suspend_noirq(struct device *dev) static int wdat_wdt_suspend_noirq(struct device *dev)
{ {
struct wdat_wdt *wdat = dev_get_drvdata(dev); struct wdat_wdt *wdat = dev_get_drvdata(dev);
@ -528,18 +527,16 @@ static int wdat_wdt_resume_noirq(struct device *dev)
return wdat_wdt_start(&wdat->wdd); return wdat_wdt_start(&wdat->wdd);
} }
#endif
static const struct dev_pm_ops wdat_wdt_pm_ops = { static const struct dev_pm_ops wdat_wdt_pm_ops = {
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq, NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq, wdat_wdt_resume_noirq)
wdat_wdt_resume_noirq)
}; };
static struct platform_driver wdat_wdt_driver = { static struct platform_driver wdat_wdt_driver = {
.probe = wdat_wdt_probe, .probe = wdat_wdt_probe,
.driver = { .driver = {
.name = "wdat_wdt", .name = "wdat_wdt",
.pm = &wdat_wdt_pm_ops, .pm = pm_sleep_ptr(&wdat_wdt_pm_ops),
}, },
}; };