Commit 5f02d033 authored by Paul Cercueil's avatar Paul Cercueil Committed by Wim Van Sebroeck
Browse files

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



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: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220628193449.160585-9-paul@crapouillou.net


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent c1eaa8c5

drivers/watchdog/wdat_wdt.c

+2 −5
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ static int wdat_wdt_probe(struct platform_device *pdev) 
	return devm_watchdog_register_device(dev, &wdat->wdd);

}



#ifdef CONFIG_PM_SLEEP

static int wdat_wdt_suspend_noirq(struct device *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);

}

#endif



static const struct dev_pm_ops wdat_wdt_pm_ops = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq,

				      wdat_wdt_resume_noirq)

	NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq, wdat_wdt_resume_noirq)

};



static struct platform_driver wdat_wdt_driver = {

	.probe = wdat_wdt_probe,

	.driver = {

		.name = "wdat_wdt",

		.pm = &wdat_wdt_pm_ops,

		.pm = pm_sleep_ptr(&wdat_wdt_pm_ops),

	},

};