Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / drivers / watchdog / bcm47xx_wdt.c

diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index 4064a43..df1c2a4 100644 (file)
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
-#include <linux/reboot.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <linux/timer.h>
@@ -88,12 +87,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)
@@ -158,34 +167,13 @@ static const struct watchdog_info bcm47xx_wdt_info = {
                                WDIOF_MAGICCLOSE,
 };
 
-static int bcm47xx_wdt_notify_sys(struct notifier_block *this,
-                                 unsigned long code, void *unused)
-{
-       struct bcm47xx_wdt *wdt;
-
-       wdt = container_of(this, struct bcm47xx_wdt, notifier);
-       if (code == SYS_DOWN || code == SYS_HALT)
-               wdt->wdd.ops->stop(&wdt->wdd);
-       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,32 +202,18 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev)
        if (ret)
                goto err_timer;
        watchdog_set_nowayout(&wdt->wdd, nowayout);
-
-       wdt->notifier.notifier_call = &bcm47xx_wdt_notify_sys;
-
-       ret = register_reboot_notifier(&wdt->notifier);
-       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;
+       watchdog_set_restart_priority(&wdt->wdd, 64);
+       watchdog_stop_on_reboot(&wdt->wdd);
 
        ret = watchdog_register_device(&wdt->wdd);
        if (ret)
-               goto err_handler;
+               goto err_timer;
 
        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:
        if (soft)
                del_timer_sync(&wdt->soft_timer);
@@ -255,7 +229,6 @@ static int bcm47xx_wdt_remove(struct platform_device *pdev)
                return -ENXIO;
 
        watchdog_unregister_device(&wdt->wdd);
-       unregister_reboot_notifier(&wdt->notifier);
 
        return 0;
 }