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

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



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: default avatarPaul Cercueil <paul@crapouillou.net>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: Alim Akhtar <alim.akhtar@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220628193449.160585-5-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 d4777d0f

drivers/watchdog/s3c2410_wdt.c

+3 −6
Original line number Diff line number Diff line
@@ -845,8 +845,6 @@ static void s3c2410wdt_shutdown(struct platform_device *dev) 
	s3c2410wdt_stop(&wdt->wdt_device);

}



#ifdef CONFIG_PM_SLEEP



static int s3c2410wdt_suspend(struct device *dev)

{

	int ret;
@@ -885,10 +883,9 @@ static int s3c2410wdt_resume(struct device *dev) 


	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(s3c2410wdt_pm_ops, s3c2410wdt_suspend,

			s3c2410wdt_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(s3c2410wdt_pm_ops,

				s3c2410wdt_suspend, s3c2410wdt_resume);



static struct platform_driver s3c2410wdt_driver = {

	.probe		= s3c2410wdt_probe,
@@ -897,7 +894,7 @@ static struct platform_driver s3c2410wdt_driver = { 
	.id_table	= s3c2410_wdt_ids,

	.driver		= {

		.name	= "s3c2410-wdt",

		.pm	= &s3c2410wdt_pm_ops,

		.pm	= pm_sleep_ptr(&s3c2410wdt_pm_ops),

		.of_match_table	= of_match_ptr(s3c2410_wdt_match),

	},

};