UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

watchdog: bcm7038_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: Paul Cercueil <paul@crapouillou.net>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220628193449.160585-2-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-06-28 20:34:42 +01:00 committed by Wim Van Sebroeck
parent c47c88555f
commit 3b956c0aae
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/watchdog/bcm7038_wdt.c
View File

@ -192,7 +192,6 @@ static int bcm7038_wdt_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int bcm7038_wdt_suspend(struct device *dev) static int bcm7038_wdt_suspend(struct device *dev)
{ {
struct bcm7038_watchdog *wdt = dev_get_drvdata(dev); struct bcm7038_watchdog *wdt = dev_get_drvdata(dev);
@ -212,10 +211,9 @@ static int bcm7038_wdt_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, bcm7038_wdt_suspend, static DEFINE_SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops,
bcm7038_wdt_resume); bcm7038_wdt_suspend, bcm7038_wdt_resume);
static const struct of_device_id bcm7038_wdt_match[] = { static const struct of_device_id bcm7038_wdt_match[] = {
{ .compatible = "brcm,bcm6345-wdt" }, { .compatible = "brcm,bcm6345-wdt" },
@ -236,7 +234,7 @@ static struct platform_driver bcm7038_wdt_driver = {
.driver = { .driver = {
.name = "bcm7038-wdt", .name = "bcm7038-wdt",
.of_match_table = bcm7038_wdt_match, .of_match_table = bcm7038_wdt_match,
.pm = &bcm7038_wdt_pm_ops, .pm = pm_sleep_ptr(&bcm7038_wdt_pm_ops),
} }
}; };
module_platform_driver(bcm7038_wdt_driver); module_platform_driver(bcm7038_wdt_driver);