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

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



Use the pm_ptr() macro to handle the .suspend/.resume callbacks.

This macro allows 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/20221020185047.1001522-3-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 b49e2a3c

drivers/watchdog/twl4030_wdt.c

+2 −7
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ static int twl4030_wdt_probe(struct platform_device *pdev) 
	return devm_watchdog_register_device(dev, wdt);

}



#ifdef CONFIG_PM

static int twl4030_wdt_suspend(struct platform_device *pdev, pm_message_t state)

{

	struct watchdog_device *wdt = platform_get_drvdata(pdev);
@@ -99,10 +98,6 @@ static int twl4030_wdt_resume(struct platform_device *pdev) 


	return 0;

}

#else

#define twl4030_wdt_suspend        NULL

#define twl4030_wdt_resume         NULL

#endif



static const struct of_device_id twl_wdt_of_match[] = {

	{ .compatible = "ti,twl4030-wdt", },
@@ -112,8 +107,8 @@ MODULE_DEVICE_TABLE(of, twl_wdt_of_match); 


static struct platform_driver twl4030_wdt_driver = {

	.probe		= twl4030_wdt_probe,

	.suspend	= twl4030_wdt_suspend,

	.resume		= twl4030_wdt_resume,

	.suspend	= pm_ptr(twl4030_wdt_suspend),

	.resume		= pm_ptr(twl4030_wdt_resume),

	.driver		= {

		.name		= "twl4030_wdt",

		.of_match_table	= twl_wdt_of_match,