From 65a4a1dc31ad9d73918971f1b89c617812c494bf Mon Sep 17 00:00:00 2001 From: Damien Riegel Date: Mon, 16 Nov 2015 12:28:00 -0500 Subject: [PATCH] watchdog: bcm47xx_wdt: use core restart handler Get rid of the custom restart handler by using the one provided by the watchdog core. Signed-off-by: Damien Riegel Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/bcm47xx_wdt.c | 33 +++++++++++++-------------------- include/linux/bcm47xx_wdt.h | 1 - 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c index 4064a43f1360..01bffe174ff9 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c @@ -88,12 +88,22 @@ static int bcm47xx_wdt_hard_set_timeout(struct watchdog_device *wdd, return 0; } +static int bcm47xx_wdt_restart(struct watchdog_device *wdd) +{ + struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); + + wdt->timer_set(wdt, 1); + + return 0; +} + static struct watchdog_ops bcm47xx_wdt_hard_ops = { .owner = THIS_MODULE, .start = bcm47xx_wdt_hard_start, .stop = bcm47xx_wdt_hard_stop, .ping = bcm47xx_wdt_hard_keepalive, .set_timeout = bcm47xx_wdt_hard_set_timeout, + .restart = bcm47xx_wdt_restart, }; static void bcm47xx_wdt_soft_timer_tick(unsigned long data) @@ -169,23 +179,13 @@ static int bcm47xx_wdt_notify_sys(struct notifier_block *this, return NOTIFY_DONE; } -static int bcm47xx_wdt_restart(struct notifier_block *this, unsigned long mode, - void *cmd) -{ - struct bcm47xx_wdt *wdt; - - wdt = container_of(this, struct bcm47xx_wdt, restart_handler); - wdt->timer_set(wdt, 1); - - return NOTIFY_DONE; -} - static struct watchdog_ops bcm47xx_wdt_soft_ops = { .owner = THIS_MODULE, .start = bcm47xx_wdt_soft_start, .stop = bcm47xx_wdt_soft_stop, .ping = bcm47xx_wdt_soft_keepalive, .set_timeout = bcm47xx_wdt_soft_set_timeout, + .restart = bcm47xx_wdt_restart, }; static int bcm47xx_wdt_probe(struct platform_device *pdev) @@ -214,6 +214,7 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) if (ret) goto err_timer; watchdog_set_nowayout(&wdt->wdd, nowayout); + watchdog_set_restart_priority(&wdt->wdd, 64); wdt->notifier.notifier_call = &bcm47xx_wdt_notify_sys; @@ -221,23 +222,15 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) if (ret) goto err_timer; - wdt->restart_handler.notifier_call = &bcm47xx_wdt_restart; - wdt->restart_handler.priority = 64; - ret = register_restart_handler(&wdt->restart_handler); - if (ret) - goto err_notifier; - ret = watchdog_register_device(&wdt->wdd); if (ret) - goto err_handler; + goto err_notifier; dev_info(&pdev->dev, "BCM47xx Watchdog Timer enabled (%d seconds%s%s)\n", timeout, nowayout ? ", nowayout" : "", soft ? ", Software Timer" : ""); return 0; -err_handler: - unregister_restart_handler(&wdt->restart_handler); err_notifier: unregister_reboot_notifier(&wdt->notifier); err_timer: diff --git a/include/linux/bcm47xx_wdt.h b/include/linux/bcm47xx_wdt.h index 5582c211f594..b708786d4cbf 100644 --- a/include/linux/bcm47xx_wdt.h +++ b/include/linux/bcm47xx_wdt.h @@ -16,7 +16,6 @@ struct bcm47xx_wdt { struct watchdog_device wdd; struct notifier_block notifier; - struct notifier_block restart_handler; struct timer_list soft_timer; atomic_t soft_ticks; -- 2.20.1