Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: kempld: 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-5-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:47 +01:00 committed by Wim Van Sebroeck
parent 0327476d6e
commit 758f46c2e6
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/watchdog/kempld_wdt.c
View File

@ -75,9 +75,7 @@ struct kempld_wdt_data {
struct watchdog_device wdd; struct watchdog_device wdd;
unsigned int pretimeout; unsigned int pretimeout;
struct kempld_wdt_stage stage[KEMPLD_WDT_MAX_STAGES]; struct kempld_wdt_stage stage[KEMPLD_WDT_MAX_STAGES];
#ifdef CONFIG_PM
u8 pm_status_store; u8 pm_status_store;
#endif
}; };
#define DEFAULT_TIMEOUT 30 /* seconds */ #define DEFAULT_TIMEOUT 30 /* seconds */
@ -495,7 +493,6 @@ static int kempld_wdt_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM
/* Disable watchdog if it is active during suspend */ /* Disable watchdog if it is active during suspend */
static int kempld_wdt_suspend(struct platform_device *pdev, static int kempld_wdt_suspend(struct platform_device *pdev,
pm_message_t message) pm_message_t message)
@ -531,18 +528,14 @@ static int kempld_wdt_resume(struct platform_device *pdev)
else else
return kempld_wdt_stop(wdd); return kempld_wdt_stop(wdd);
} }
#else
#define kempld_wdt_suspend NULL
#define kempld_wdt_resume NULL
#endif
static struct platform_driver kempld_wdt_driver = { static struct platform_driver kempld_wdt_driver = {
.driver = { .driver = {
.name = "kempld-wdt", .name = "kempld-wdt",
}, },
.probe = kempld_wdt_probe, .probe = kempld_wdt_probe,
.suspend = kempld_wdt_suspend, .suspend = pm_ptr(kempld_wdt_suspend),
.resume = kempld_wdt_resume, .resume = pm_ptr(kempld_wdt_resume),
}; };
module_platform_driver(kempld_wdt_driver); module_platform_driver(kempld_wdt_driver);