summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/wm831x_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2011-11-29 16:24:16 +0100
committerWim Van Sebroeck <wim@iguana.be>2012-01-06 15:22:04 +0100
commitff0b3cd4a416bc727b0797b95b229b278d2a28f2 (patch)
treecd6bdc2304ee8fd751f3bd79607c7bcaf337e198 /drivers/watchdog/wm831x_wdt.c
parentb8ec61189f3b4cd9d1b2856342f5d7676151d01c (diff)
downloadblackbird-op-linux-ff0b3cd4a416bc727b0797b95b229b278d2a28f2.tar.gz
blackbird-op-linux-ff0b3cd4a416bc727b0797b95b229b278d2a28f2.zip
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>
Diffstat (limited to 'drivers/watchdog/wm831x_wdt.c')
-rw-r--r--drivers/watchdog/wm831x_wdt.c4
1 files changed, 1 insertions, 3 deletions
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++)
OpenPOWER on IntegriCloud