summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2013-02-16 18:49:26 -0500
committerWim Van Sebroeck <wim@iguana.be>2013-03-01 06:49:02 -0500
commit2dd7b24467143c3fd17c6abcaf04fef7976b1528 (patch)
tree598d6ca1e865810ed864fe32b6e2563924f9e336
parent3048253ed957fc6cdc34599178408559aa1e0062 (diff)
watchdog: omap_wdt: Add option nowayout
Like other watchdog drivers, this patch adds new option nowayout which overwrite WATCHDOG_NOWAYOUT. Signed-off-by: Pali Rohar <pali.rohar@gmail.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/omap_wdt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index b0e541d022e6..af88ffd1068f 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -45,6 +45,11 @@
45 45
46#include "omap_wdt.h" 46#include "omap_wdt.h"
47 47
48static bool nowayout = WATCHDOG_NOWAYOUT;
49module_param(nowayout, bool, 0);
50MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
51 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
52
48static unsigned timer_margin; 53static unsigned timer_margin;
49module_param(timer_margin, uint, 0); 54module_param(timer_margin, uint, 0);
50MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)"); 55MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)");
@@ -201,7 +206,6 @@ static const struct watchdog_ops omap_wdt_ops = {
201static int omap_wdt_probe(struct platform_device *pdev) 206static int omap_wdt_probe(struct platform_device *pdev)
202{ 207{
203 struct omap_wd_timer_platform_data *pdata = pdev->dev.platform_data; 208 struct omap_wd_timer_platform_data *pdata = pdev->dev.platform_data;
204 bool nowayout = WATCHDOG_NOWAYOUT;
205 struct watchdog_device *omap_wdt; 209 struct watchdog_device *omap_wdt;
206 struct resource *res, *mem; 210 struct resource *res, *mem;
207 struct omap_wdt_dev *wdev; 211 struct omap_wdt_dev *wdev;