watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API

Add two nowayout helpers for the Watchdog Timer Driver Kernel API.
And apply this to the already converted drivers.
Note: s3c2410_wdt lost the nowayout feature during the conversion.

Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index a79e3840782a..4bc3744e14e4 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -378,6 +378,8 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
                                                         "cannot start\n");
         }
 
+        watchdog_set_nowayout(&s3c2410_wdd, nowayout);
+
         ret = watchdog_register_device(&s3c2410_wdd);
         if (ret) {
                 dev_err(dev, "cannot register watchdog (%d)\n", ret);
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index beb3ad2294d3..6cd1ba41b47c 100644
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -213,11 +213,9 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
 
         wm831x_wdt->info = &wm831x_wdt_info;
         wm831x_wdt->ops = &wm831x_wdt_ops;
+        watchdog_set_nowayout(wm831x_wdt, nowayout);
         watchdog_set_drvdata(wm831x_wdt, driver_data);
 
-        if (nowayout)
-                wm831x_wdt->status |= WDOG_NO_WAY_OUT;
-
         reg = wm831x_reg_read(wm831x, WM831X_WATCHDOG);
         reg &= WM831X_WDOG_TO_MASK;
         for (i = 0; i < ARRAY_SIZE(wm831x_wdt_cfgs); i++)