ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20221020185047.1001522-3-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-10-20 19:50:45 +01:00
committed by Wim Van Sebroeck
parent b49e2a3cfb
commit d36eda79c6
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/watchdog/twl4030_wdt.c
View File

@@ -81,7 +81,6 @@ static int twl4030_wdt_probe(struct platform_device *pdev)
return devm_watchdog_register_device(dev, wdt); return devm_watchdog_register_device(dev, wdt);
} }
#ifdef CONFIG_PM
static int twl4030_wdt_suspend(struct platform_device *pdev, pm_message_t state) static int twl4030_wdt_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct watchdog_device *wdt = platform_get_drvdata(pdev); struct watchdog_device *wdt = platform_get_drvdata(pdev);
@@ -99,10 +98,6 @@ static int twl4030_wdt_resume(struct platform_device *pdev)
return 0; return 0;
} }
#else
#define twl4030_wdt_suspend NULL
#define twl4030_wdt_resume NULL
#endif
static const struct of_device_id twl_wdt_of_match[] = { static const struct of_device_id twl_wdt_of_match[] = {
{ .compatible = "ti,twl4030-wdt", }, { .compatible = "ti,twl4030-wdt", },
@@ -112,8 +107,8 @@ MODULE_DEVICE_TABLE(of, twl_wdt_of_match);
static struct platform_driver twl4030_wdt_driver = { static struct platform_driver twl4030_wdt_driver = {
.probe = twl4030_wdt_probe, .probe = twl4030_wdt_probe,
.suspend = twl4030_wdt_suspend, .suspend = pm_ptr(twl4030_wdt_suspend),
.resume = twl4030_wdt_resume, .resume = pm_ptr(twl4030_wdt_resume),
.driver = { .driver = {
.name = "twl4030_wdt", .name = "twl4030_wdt",
.of_match_table = twl_wdt_of_match, .of_match_table = twl_wdt_of_match,