diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-08-08 09:56:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-08-08 09:56:53 +1000 |
| commit | 054dd4e183d54ed47a2956719ba08cfa7ccbf1b6 (patch) | |
| tree | 9161668f15791f3a2a2523208560ecdd6fe8f66f /drivers/watchdog/bcm7038_wdt.c | |
| parent | fd1a06f8fd5cb3277295005936dfcf052d7252bc (diff) | |
| parent | 2d27e52841092e5831dd41f313028c668d816eb0 (diff) | |
Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git
# Conflicts:
# Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
Diffstat (limited to 'drivers/watchdog/bcm7038_wdt.c')
| -rw-r--r-- | drivers/watchdog/bcm7038_wdt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index 1ffcf6aca6ae..9388838899ac 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -192,7 +192,6 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP static int bcm7038_wdt_suspend(struct device *dev) { struct bcm7038_watchdog *wdt = dev_get_drvdata(dev); @@ -212,10 +211,9 @@ static int bcm7038_wdt_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, bcm7038_wdt_suspend, - bcm7038_wdt_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, + bcm7038_wdt_suspend, bcm7038_wdt_resume); static const struct of_device_id bcm7038_wdt_match[] = { { .compatible = "brcm,bcm6345-wdt" }, @@ -236,7 +234,7 @@ static struct platform_driver bcm7038_wdt_driver = { .driver = { .name = "bcm7038-wdt", .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); |