[WATCHDOG] change reboot_notifier to platform-shutdown method.

Platform device drivers can use the .shutdown method to handle soft
shutdown's instead of reboot_notifier's.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 8c6babb2d65274b990bdc292b88f605784e13240..9c7ccd1e9088fbd5f108fe7c96980d7cda07d8e3 100644 (file)
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -19,8 +19,6 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/fs.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/uaccess.h>
@@ -309,26 +307,6 @@ static long bfin_wdt_ioctl(struct file *file,
        }
 }
 
-/**
- *     bfin_wdt_notify_sys - Notifier Handler
- *     @this: notifier block
- *     @code: notifier event
- *     @unused: unused
- *
- *     Handles specific events, such as turning off the watchdog during a
- *     shutdown event.
- */
-static int bfin_wdt_notify_sys(struct notifier_block *this,
-                                       unsigned long code, void *unused)
-{
-       stampit();
-
-       if (code == SYS_DOWN || code == SYS_HALT)
-               bfin_wdt_stop();
-
-       return NOTIFY_DONE;
-}
-
 #ifdef CONFIG_PM
 static int state_before_suspend;
 
@@ -395,33 +373,21 @@ static const struct watchdog_info bfin_wdt_info = {
                    WDIOF_MAGICCLOSE,
 };
 
-static struct notifier_block bfin_wdt_notifier = {
-       .notifier_call = bfin_wdt_notify_sys,
-};
-
 /**
  *     bfin_wdt_probe - Initialize module
  *
- *     Registers the misc device and notifier handler.  Actual device
+ *     Registers the misc device.  Actual device
  *     initialization is handled by bfin_wdt_open().
  */
 static int __devinit bfin_wdt_probe(struct platform_device *pdev)
 {
        int ret;
 
-       ret = register_reboot_notifier(&bfin_wdt_notifier);
-       if (ret) {
-               pr_devinit(KERN_ERR PFX
-                       "cannot register reboot notifier (err=%d)\n", ret);
-               return ret;
-       }
-
        ret = misc_register(&bfin_wdt_miscdev);
        if (ret) {
                pr_devinit(KERN_ERR PFX
                        "cannot register miscdev on minor=%d (err=%d)\n",
                                WATCHDOG_MINOR, ret);
-               unregister_reboot_notifier(&bfin_wdt_notifier);
                return ret;
        }
 
@@ -434,21 +400,33 @@ static int __devinit bfin_wdt_probe(struct platform_device *pdev)
 /**
  *     bfin_wdt_remove - Initialize module
  *
- *     Unregisters the misc device and notifier handler.  Actual device
+ *     Unregisters the misc device.  Actual device
  *     deinitialization is handled by bfin_wdt_close().
  */
 static int __devexit bfin_wdt_remove(struct platform_device *pdev)
 {
        misc_deregister(&bfin_wdt_miscdev);
-       unregister_reboot_notifier(&bfin_wdt_notifier);
        return 0;
 }
 
+/**
+ *     bfin_wdt_shutdown - Soft Shutdown Handler
+ *
+ *     Handles the soft shutdown event.
+ */
+static void bfin_wdt_shutdown(struct platform_device *pdev)
+{
+       stampit();
+
+       bfin_wdt_stop();
+}
+
 static struct platform_device *bfin_wdt_device;
 
 static struct platform_driver bfin_wdt_driver = {
        .probe     = bfin_wdt_probe,
        .remove    = __devexit_p(bfin_wdt_remove),
+       .shutdown  = bfin_wdt_shutdown,
        .suspend   = bfin_wdt_suspend,
        .resume    = bfin_wdt_resume,
        .driver    = {

diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index d635566e9307235f6d09d5f39fb1ce0a963060a9..9e9ed7bfabcb1a51deae636635d0f33914cf201c 100644 (file)
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -13,7 +13,6 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/fs.h>
-#include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/uaccess.h>
 #include <linux/platform_device.h>
@@ -166,14 +165,6 @@ static long txx9wdt_ioctl(struct file *file, unsigned int cmd,
        }
 }
 
-static int txx9wdt_notify_sys(struct notifier_block *this, unsigned long code,
-       void *unused)
-{
-       if (code == SYS_DOWN || code == SYS_HALT)
-               txx9wdt_stop();
-       return NOTIFY_DONE;
-}
-
 static const struct file_operations txx9wdt_fops = {
        .owner          =       THIS_MODULE,
        .llseek         =       no_llseek,
@@ -189,10 +180,6 @@ static struct miscdevice txx9wdt_miscdev = {
        .fops   =       &txx9wdt_fops,
 };
 
-static struct notifier_block txx9wdt_notifier = {
-       .notifier_call = txx9wdt_notify_sys,
-};
-
 static int __init txx9wdt_probe(struct platform_device *dev)
 {
        struct resource *res;
@@ -221,13 +208,8 @@ static int __init txx9wdt_probe(struct platform_device *dev)
        if (!txx9wdt_reg)
                goto exit_busy;
 
-       ret = register_reboot_notifier(&txx9wdt_notifier);
-       if (ret)
-               goto exit;
-
        ret = misc_register(&txx9wdt_miscdev);
        if (ret) {
-               unregister_reboot_notifier(&txx9wdt_notifier);
                goto exit;
        }
 
@@ -249,14 +231,19 @@ exit:
 static int __exit txx9wdt_remove(struct platform_device *dev)
 {
        misc_deregister(&txx9wdt_miscdev);
-       unregister_reboot_notifier(&txx9wdt_notifier);
        clk_disable(txx9_imclk);
        clk_put(txx9_imclk);
        return 0;
 }
 
+static void txx9wdt_shutdown(struct platform_device *dev)
+{
+       txx9wdt_stop();
+}
+
 static struct platform_driver txx9wdt_driver = {
        .remove = __exit_p(txx9wdt_remove),
+       .shutdown = txx9wdt_shutdown,
        .driver = {
                .name = "txx9wdt",
                .owner = THIS_MODULE,