aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2012-03-05 10:51:11 -0500
committerWim Van Sebroeck <wim@iguana.be>2012-03-27 14:06:02 -0400
commit86a1e1896c2710402e29a875d8d830244274244d (patch)
tree1b27f5107ec51e06921e510c67eeca47ba1b5a66 /drivers
parent27c766aaacb265d625dc634bf7903f7f9fd0c697 (diff)
watchdog: nowayout is bool
nowayout is actually a boolean value. So make it bool for all watchdog device drivers. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/ipmi/ipmi_watchdog.c4
-rw-r--r--drivers/hwmon/fschmd.c4
-rw-r--r--drivers/hwmon/w83793.c4
-rw-r--r--drivers/watchdog/acquirewdt.c4
-rw-r--r--drivers/watchdog/advantechwdt.c4
-rw-r--r--drivers/watchdog/alim1535_wdt.c4
-rw-r--r--drivers/watchdog/alim7101_wdt.c4
-rw-r--r--drivers/watchdog/ar7_wdt.c4
-rw-r--r--drivers/watchdog/at32ap700x_wdt.c4
-rw-r--r--drivers/watchdog/at91rm9200_wdt.c4
-rw-r--r--drivers/watchdog/at91sam9_wdt.c4
-rw-r--r--drivers/watchdog/ath79_wdt.c4
-rw-r--r--drivers/watchdog/bcm47xx_wdt.c4
-rw-r--r--drivers/watchdog/bcm63xx_wdt.c4
-rw-r--r--drivers/watchdog/bfin_wdt.c4
-rw-r--r--drivers/watchdog/dw_wdt.c4
-rw-r--r--drivers/watchdog/ep93xx_wdt.c4
-rw-r--r--drivers/watchdog/eurotechwdt.c4
-rw-r--r--drivers/watchdog/gef_wdt.c4
-rw-r--r--drivers/watchdog/geodewdt.c4
-rw-r--r--drivers/watchdog/hpwdt.c4
-rw-r--r--drivers/watchdog/i6300esb.c4
-rw-r--r--drivers/watchdog/iTCO_wdt.c4
-rw-r--r--drivers/watchdog/ib700wdt.c4
-rw-r--r--drivers/watchdog/ibmasr.c4
-rw-r--r--drivers/watchdog/imx2_wdt.c4
-rw-r--r--drivers/watchdog/indydog.c4
-rw-r--r--drivers/watchdog/iop_wdt.c4
-rw-r--r--drivers/watchdog/it8712f_wdt.c4
-rw-r--r--drivers/watchdog/it87_wdt.c4
-rw-r--r--drivers/watchdog/ixp2000_wdt.c4
-rw-r--r--drivers/watchdog/ixp4xx_wdt.c4
-rw-r--r--drivers/watchdog/ks8695_wdt.c4
-rw-r--r--drivers/watchdog/lantiq_wdt.c4
-rw-r--r--drivers/watchdog/m54xx_wdt.c4
-rw-r--r--drivers/watchdog/machzwd.c4
-rw-r--r--drivers/watchdog/max63xx_wdt.c4
-rw-r--r--drivers/watchdog/mixcomwd.c4
-rw-r--r--drivers/watchdog/mpc8xxx_wdt.c4
-rw-r--r--drivers/watchdog/mpcore_wdt.c4
-rw-r--r--drivers/watchdog/mv64x60_wdt.c4
-rw-r--r--drivers/watchdog/nuc900_wdt.c4
-rw-r--r--drivers/watchdog/nv_tco.c4
-rw-r--r--drivers/watchdog/octeon-wdt-main.c4
-rw-r--r--drivers/watchdog/orion_wdt.c4
-rw-r--r--drivers/watchdog/pc87413_wdt.c4
-rw-r--r--drivers/watchdog/pcwd.c4
-rw-r--r--drivers/watchdog/pcwd_pci.c4
-rw-r--r--drivers/watchdog/pcwd_usb.c4
-rw-r--r--drivers/watchdog/pika_wdt.c4
-rw-r--r--drivers/watchdog/pnx4008_wdt.c4
-rw-r--r--drivers/watchdog/pnx833x_wdt.c4
-rw-r--r--drivers/watchdog/rc32434_wdt.c4
-rw-r--r--drivers/watchdog/s3c2410_wdt.c4
-rw-r--r--drivers/watchdog/sbc60xxwdt.c4
-rw-r--r--drivers/watchdog/sbc7240_wdt.c4
-rw-r--r--drivers/watchdog/sbc8360.c4
-rw-r--r--drivers/watchdog/sbc_epx_c3.c4
-rw-r--r--drivers/watchdog/sbc_fitpc2_wdt.c4
-rw-r--r--drivers/watchdog/sc1200wdt.c4
-rw-r--r--drivers/watchdog/sc520_wdt.c4
-rw-r--r--drivers/watchdog/sch311x_wdt.c4
-rw-r--r--drivers/watchdog/scx200_wdt.c4
-rw-r--r--drivers/watchdog/shwdt.c4
-rw-r--r--drivers/watchdog/smsc37b787_wdt.c4
-rw-r--r--drivers/watchdog/softdog.c4
-rw-r--r--drivers/watchdog/sp5100_tco.c4
-rw-r--r--drivers/watchdog/sp805_wdt.c4
-rw-r--r--drivers/watchdog/stmp3xxx_wdt.c2
-rw-r--r--drivers/watchdog/ts72xx_wdt.c4
-rw-r--r--drivers/watchdog/twl4030_wdt.c4
-rw-r--r--drivers/watchdog/txx9wdt.c4
-rw-r--r--drivers/watchdog/via_wdt.c4
-rw-r--r--drivers/watchdog/w83627hf_wdt.c4
-rw-r--r--drivers/watchdog/w83697hf_wdt.c4
-rw-r--r--drivers/watchdog/w83697ug_wdt.c4
-rw-r--r--drivers/watchdog/w83877f_wdt.c4
-rw-r--r--drivers/watchdog/w83977f_wdt.c4
-rw-r--r--drivers/watchdog/wafer5823wdt.c4
-rw-r--r--drivers/watchdog/wdrtas.c2
-rw-r--r--drivers/watchdog/wdt.c4
-rw-r--r--drivers/watchdog/wdt977.c4
-rw-r--r--drivers/watchdog/wdt_pci.c4
-rw-r--r--drivers/watchdog/wm831x_wdt.c4
-rw-r--r--drivers/watchdog/wm8350_wdt.c4
85 files changed, 168 insertions, 168 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 34767a6d7f42..020a6aec2d86 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -153,7 +153,7 @@
153#endif 153#endif
154 154
155static DEFINE_MUTEX(ipmi_watchdog_mutex); 155static DEFINE_MUTEX(ipmi_watchdog_mutex);
156static int nowayout = WATCHDOG_NOWAYOUT; 156static bool nowayout = WATCHDOG_NOWAYOUT;
157 157
158static ipmi_user_t watchdog_user; 158static ipmi_user_t watchdog_user;
159static int watchdog_ifnum; 159static int watchdog_ifnum;
@@ -320,7 +320,7 @@ module_param(start_now, int, 0444);
320MODULE_PARM_DESC(start_now, "Set to 1 to start the watchdog as" 320MODULE_PARM_DESC(start_now, "Set to 1 to start the watchdog as"
321 "soon as the driver is loaded."); 321 "soon as the driver is loaded.");
322 322
323module_param(nowayout, int, 0644); 323module_param(nowayout, bool, 0644);
324MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 324MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
325 "(default=CONFIG_WATCHDOG_NOWAYOUT)"); 325 "(default=CONFIG_WATCHDOG_NOWAYOUT)");
326 326
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index 8305d29459bd..519ce8b9c142 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -53,8 +53,8 @@
53static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; 53static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
54 54
55/* Insmod parameters */ 55/* Insmod parameters */
56static int nowayout = WATCHDOG_NOWAYOUT; 56static bool nowayout = WATCHDOG_NOWAYOUT;
57module_param(nowayout, int, 0); 57module_param(nowayout, bool, 0);
58MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 58MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
59 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 59 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
60 60
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 834e49d1827b..d6b0bdd48651 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -71,8 +71,8 @@ MODULE_PARM_DESC(timeout,
71 "Watchdog timeout in minutes. 2<= timeout <=255 (default=" 71 "Watchdog timeout in minutes. 2<= timeout <=255 (default="
72 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 72 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
73 73
74static int nowayout = WATCHDOG_NOWAYOUT; 74static bool nowayout = WATCHDOG_NOWAYOUT;
75module_param(nowayout, int, 0); 75module_param(nowayout, bool, 0);
76MODULE_PARM_DESC(nowayout, 76MODULE_PARM_DESC(nowayout,
77 "Watchdog cannot be stopped once started (default=" 77 "Watchdog cannot be stopped once started (default="
78 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 78 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 8947ccd71efc..4397881c83f4 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -93,8 +93,8 @@ static int wdt_start = 0x443;
93module_param(wdt_start, int, 0); 93module_param(wdt_start, int, 0);
94MODULE_PARM_DESC(wdt_start, "Acquire WDT 'start' io port (default 0x443)"); 94MODULE_PARM_DESC(wdt_start, "Acquire WDT 'start' io port (default 0x443)");
95 95
96static int nowayout = WATCHDOG_NOWAYOUT; 96static bool nowayout = WATCHDOG_NOWAYOUT;
97module_param(nowayout, int, 0); 97module_param(nowayout, bool, 0);
98MODULE_PARM_DESC(nowayout, 98MODULE_PARM_DESC(nowayout,
99 "Watchdog cannot be stopped once started (default=" 99 "Watchdog cannot be stopped once started (default="
100 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 100 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 986258a06676..72e81058176a 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -78,8 +78,8 @@ MODULE_PARM_DESC(timeout,
78 "Watchdog timeout in seconds. 1<= timeout <=63, default=" 78 "Watchdog timeout in seconds. 1<= timeout <=63, default="
79 __MODULE_STRING(WATCHDOG_TIMEOUT) "."); 79 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
80 80
81static int nowayout = WATCHDOG_NOWAYOUT; 81static bool nowayout = WATCHDOG_NOWAYOUT;
82module_param(nowayout, int, 0); 82module_param(nowayout, bool, 0);
83MODULE_PARM_DESC(nowayout, 83MODULE_PARM_DESC(nowayout,
84 "Watchdog cannot be stopped once started (default=" 84 "Watchdog cannot be stopped once started (default="
85 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 85 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index e802f5e02418..41b84936a521 100644
--- a/drivers/watchdog/alim1535_wdt.c
+++ b/drivers/watchdog/alim1535_wdt.c
@@ -40,8 +40,8 @@ MODULE_PARM_DESC(timeout,
40 "Watchdog timeout in seconds. (0 < timeout < 18000, default=" 40 "Watchdog timeout in seconds. (0 < timeout < 18000, default="
41 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 41 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
42 42
43static int nowayout = WATCHDOG_NOWAYOUT; 43static bool nowayout = WATCHDOG_NOWAYOUT;
44module_param(nowayout, int, 0); 44module_param(nowayout, bool, 0);
45MODULE_PARM_DESC(nowayout, 45MODULE_PARM_DESC(nowayout,
46 "Watchdog cannot be stopped once started (default=" 46 "Watchdog cannot be stopped once started (default="
47 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 47 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index e90f4ce32799..b9e9558ab218 100644
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -78,8 +78,8 @@ static unsigned long wdt_is_open;
78static char wdt_expect_close; 78static char wdt_expect_close;
79static struct pci_dev *alim7101_pmu; 79static struct pci_dev *alim7101_pmu;
80 80
81static int nowayout = WATCHDOG_NOWAYOUT; 81static bool nowayout = WATCHDOG_NOWAYOUT;
82module_param(nowayout, int, 0); 82module_param(nowayout, bool, 0);
83MODULE_PARM_DESC(nowayout, 83MODULE_PARM_DESC(nowayout,
84 "Watchdog cannot be stopped once started (default=" 84 "Watchdog cannot be stopped once started (default="
85 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 85 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index 2df16eb9d6dd..639ae9a23fbc 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -52,8 +52,8 @@ static int margin = 60;
52module_param(margin, int, 0); 52module_param(margin, int, 0);
53MODULE_PARM_DESC(margin, "Watchdog margin in seconds"); 53MODULE_PARM_DESC(margin, "Watchdog margin in seconds");
54 54
55static int nowayout = WATCHDOG_NOWAYOUT; 55static bool nowayout = WATCHDOG_NOWAYOUT;
56module_param(nowayout, int, 0); 56module_param(nowayout, bool, 0);
57MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); 57MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
58 58
59#define READ_REG(x) readl((void __iomem *)&(x)) 59#define READ_REG(x) readl((void __iomem *)&(x))
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index 4ca5d40304b2..2896430ce42c 100644
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -45,8 +45,8 @@ MODULE_PARM_DESC(timeout,
45 "Timeout value. Limited to be 1 or 2 seconds. (default=" 45 "Timeout value. Limited to be 1 or 2 seconds. (default="
46 __MODULE_STRING(TIMEOUT_DEFAULT) ")"); 46 __MODULE_STRING(TIMEOUT_DEFAULT) ")");
47 47
48static int nowayout = WATCHDOG_NOWAYOUT; 48static bool nowayout = WATCHDOG_NOWAYOUT;
49module_param(nowayout, int, 0); 49module_param(nowayout, bool, 0);
50MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 50MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
51 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 51 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
52 52
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 3ecd246d2cfd..ad12c2030441 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -30,14 +30,14 @@
30#define WDT_MAX_TIME 256 /* seconds */ 30#define WDT_MAX_TIME 256 /* seconds */
31 31
32static int wdt_time = WDT_DEFAULT_TIME; 32static int wdt_time = WDT_DEFAULT_TIME;
33static int nowayout = WATCHDOG_NOWAYOUT; 33static bool nowayout = WATCHDOG_NOWAYOUT;
34 34
35module_param(wdt_time, int, 0); 35module_param(wdt_time, int, 0);
36MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default=" 36MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
37 __MODULE_STRING(WDT_DEFAULT_TIME) ")"); 37 __MODULE_STRING(WDT_DEFAULT_TIME) ")");
38 38
39#ifdef CONFIG_WATCHDOG_NOWAYOUT 39#ifdef CONFIG_WATCHDOG_NOWAYOUT
40module_param(nowayout, int, 0); 40module_param(nowayout, bool, 0);
41MODULE_PARM_DESC(nowayout, 41MODULE_PARM_DESC(nowayout,
42 "Watchdog cannot be stopped once started (default=" 42 "Watchdog cannot be stopped once started (default="
43 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 43 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index cf39847bbad3..05e1be85fdee 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -62,8 +62,8 @@ module_param(heartbeat, int, 0);
62MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " 62MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
63 "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")"); 63 "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
64 64
65static int nowayout = WATCHDOG_NOWAYOUT; 65static bool nowayout = WATCHDOG_NOWAYOUT;
66module_param(nowayout, int, 0); 66module_param(nowayout, bool, 0);
67MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 67MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
68 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 68 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
69 69
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 3bb49fd8d384..1f9371f49c40 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -47,8 +47,8 @@
47#define WDOG_CTRL_ACTION_NMI 2 /* NMI */ 47#define WDOG_CTRL_ACTION_NMI 2 /* NMI */
48#define WDOG_CTRL_ACTION_FCR 3 /* full chip reset */ 48#define WDOG_CTRL_ACTION_FCR 3 /* full chip reset */
49 49
50static int nowayout = WATCHDOG_NOWAYOUT; 50static bool nowayout = WATCHDOG_NOWAYOUT;
51module_param(nowayout, int, 0); 51module_param(nowayout, bool, 0);
52MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 52MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
53 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 53 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
54 54
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index 1989e179db17..bc0e91e78e86 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -35,14 +35,14 @@
35#define WDT_MAX_TIME 255 /* seconds */ 35#define WDT_MAX_TIME 255 /* seconds */
36 36
37static int wdt_time = WDT_DEFAULT_TIME; 37static int wdt_time = WDT_DEFAULT_TIME;
38static int nowayout = WATCHDOG_NOWAYOUT; 38static bool nowayout = WATCHDOG_NOWAYOUT;
39 39
40module_param(wdt_time, int, 0); 40module_param(wdt_time, int, 0);
41MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default=" 41MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
42 __MODULE_STRING(WDT_DEFAULT_TIME) ")"); 42 __MODULE_STRING(WDT_DEFAULT_TIME) ")");
43 43
44#ifdef CONFIG_WATCHDOG_NOWAYOUT 44#ifdef CONFIG_WATCHDOG_NOWAYOUT
45module_param(nowayout, int, 0); 45module_param(nowayout, bool, 0);
46MODULE_PARM_DESC(nowayout, 46MODULE_PARM_DESC(nowayout,
47 "Watchdog cannot be stopped once started (default=" 47 "Watchdog cannot be stopped once started (default="
48 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 48 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index af95b386d8f5..8379dc32fd90 100644
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -52,8 +52,8 @@ static struct {
52static int expect_close; 52static int expect_close;
53 53
54static int wdt_time = WDT_DEFAULT_TIME; 54static int wdt_time = WDT_DEFAULT_TIME;
55static int nowayout = WATCHDOG_NOWAYOUT; 55static bool nowayout = WATCHDOG_NOWAYOUT;
56module_param(nowayout, int, 0); 56module_param(nowayout, bool, 0);
57MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 57MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
58 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 58 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
59 59
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 402e9ccea395..38bc383e0677 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -49,7 +49,7 @@
49#define WATCHDOG_TIMEOUT 20 49#define WATCHDOG_TIMEOUT 20
50 50
51static unsigned int timeout = WATCHDOG_TIMEOUT; 51static unsigned int timeout = WATCHDOG_TIMEOUT;
52static int nowayout = WATCHDOG_NOWAYOUT; 52static bool nowayout = WATCHDOG_NOWAYOUT;
53static const struct watchdog_info bfin_wdt_info; 53static const struct watchdog_info bfin_wdt_info;
54static unsigned long open_check; 54static unsigned long open_check;
55static char expect_close; 55static char expect_close;
@@ -472,7 +472,7 @@ MODULE_PARM_DESC(timeout,
472 "Watchdog timeout in seconds. (1<=timeout<=((2^32)/SCLK), default=" 472 "Watchdog timeout in seconds. (1<=timeout<=((2^32)/SCLK), default="
473 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 473 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
474 474
475module_param(nowayout, int, 0); 475module_param(nowayout, bool, 0);
476MODULE_PARM_DESC(nowayout, 476MODULE_PARM_DESC(nowayout,
477 "Watchdog cannot be stopped once started (default=" 477 "Watchdog cannot be stopped once started (default="
478 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 478 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 78a6827f7de6..06de1211a444 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -46,8 +46,8 @@
46/* The maximum TOP (timeout period) value that can be set in the watchdog. */ 46/* The maximum TOP (timeout period) value that can be set in the watchdog. */
47#define DW_WDT_MAX_TOP 15 47#define DW_WDT_MAX_TOP 15
48 48
49static int nowayout = WATCHDOG_NOWAYOUT; 49static bool nowayout = WATCHDOG_NOWAYOUT;
50module_param(nowayout, int, 0); 50module_param(nowayout, bool, 0);
51MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 51MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
52 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 52 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
53 53
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index a6532b52c457..8caa3164270c 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -39,7 +39,7 @@
39/* default timeout (secs) */ 39/* default timeout (secs) */
40#define WDT_TIMEOUT 30 40#define WDT_TIMEOUT 30
41 41
42static int nowayout = WATCHDOG_NOWAYOUT; 42static bool nowayout = WATCHDOG_NOWAYOUT;
43static int timeout = WDT_TIMEOUT; 43static int timeout = WDT_TIMEOUT;
44 44
45static struct timer_list timer; 45static struct timer_list timer;
@@ -237,7 +237,7 @@ static void __exit ep93xx_wdt_exit(void)
237module_init(ep93xx_wdt_init); 237module_init(ep93xx_wdt_init);
238module_exit(ep93xx_wdt_exit); 238module_exit(ep93xx_wdt_exit);
239 239
240module_param(nowayout, int, 0); 240module_param(nowayout, bool, 0);
241MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 241MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
242 242
243module_param(timeout, int, 0); 243module_param(timeout, int, 0);
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index 22d967a5ac8c..0c60af14ac65 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -78,8 +78,8 @@ static char *ev = "int";
78 78
79#define WDT_TIMEOUT 60 /* 1 minute */ 79#define WDT_TIMEOUT 60 /* 1 minute */
80 80
81static int nowayout = WATCHDOG_NOWAYOUT; 81static bool nowayout = WATCHDOG_NOWAYOUT;
82module_param(nowayout, int, 0); 82module_param(nowayout, bool, 0);
83MODULE_PARM_DESC(nowayout, 83MODULE_PARM_DESC(nowayout,
84 "Watchdog cannot be stopped once started (default=" 84 "Watchdog cannot be stopped once started (default="
85 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 85 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index d95203be37ad..17f4cae770c6 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -70,8 +70,8 @@ static unsigned int bus_clk;
70static char expect_close; 70static char expect_close;
71static DEFINE_SPINLOCK(gef_wdt_spinlock); 71static DEFINE_SPINLOCK(gef_wdt_spinlock);
72 72
73static int nowayout = WATCHDOG_NOWAYOUT; 73static bool nowayout = WATCHDOG_NOWAYOUT;
74module_param(nowayout, int, 0); 74module_param(nowayout, bool, 0);
75MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 75MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
76 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 76 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
77 77
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 19044a39c407..dc563b680abd 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -40,8 +40,8 @@ MODULE_PARM_DESC(timeout,
40 "Watchdog timeout in seconds. 1<= timeout <=131, default=" 40 "Watchdog timeout in seconds. 1<= timeout <=131, default="
41 __MODULE_STRING(WATCHDOG_TIMEOUT) "."); 41 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
42 42
43static int nowayout = WATCHDOG_NOWAYOUT; 43static bool nowayout = WATCHDOG_NOWAYOUT;
44module_param(nowayout, int, 0); 44module_param(nowayout, bool, 0);
45MODULE_PARM_DESC(nowayout, 45MODULE_PARM_DESC(nowayout,
46 "Watchdog cannot be stopped once started (default=" 46 "Watchdog cannot be stopped once started (default="
47 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 47 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 54c64f56af2a..cbc7ceef2786 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -47,7 +47,7 @@
47 47
48static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */ 48static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */
49static unsigned int reload; /* the computed soft_margin */ 49static unsigned int reload; /* the computed soft_margin */
50static int nowayout = WATCHDOG_NOWAYOUT; 50static bool nowayout = WATCHDOG_NOWAYOUT;
51static char expect_release; 51static char expect_release;
52static unsigned long hpwdt_is_open; 52static unsigned long hpwdt_is_open;
53 53
@@ -874,7 +874,7 @@ MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
874module_param(soft_margin, int, 0); 874module_param(soft_margin, int, 0);
875MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); 875MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds");
876 876
877module_param(nowayout, int, 0); 877module_param(nowayout, bool, 0);
878MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 878MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
879 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 879 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
880 880
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 15548e622754..738032a36bcf 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -95,8 +95,8 @@ MODULE_PARM_DESC(heartbeat,
95 "Watchdog heartbeat in seconds. (1<heartbeat<2046, default=" 95 "Watchdog heartbeat in seconds. (1<heartbeat<2046, default="
96 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 96 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
97 97
98static int nowayout = WATCHDOG_NOWAYOUT; 98static bool nowayout = WATCHDOG_NOWAYOUT;
99module_param(nowayout, int, 0); 99module_param(nowayout, bool, 0);
100MODULE_PARM_DESC(nowayout, 100MODULE_PARM_DESC(nowayout,
101 "Watchdog cannot be stopped once started (default=" 101 "Watchdog cannot be stopped once started (default="
102 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 102 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 3b4db72f6ac8..9fecb95645a3 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -414,8 +414,8 @@ MODULE_PARM_DESC(heartbeat, "Watchdog timeout in seconds. "
414 "5..76 (TCO v1) or 3..614 (TCO v2), default=" 414 "5..76 (TCO v1) or 3..614 (TCO v2), default="
415 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 415 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
416 416
417static int nowayout = WATCHDOG_NOWAYOUT; 417static bool nowayout = WATCHDOG_NOWAYOUT;
418module_param(nowayout, int, 0); 418module_param(nowayout, bool, 0);
419MODULE_PARM_DESC(nowayout, 419MODULE_PARM_DESC(nowayout,
420 "Watchdog cannot be stopped once started (default=" 420 "Watchdog cannot be stopped once started (default="
421 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 421 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 7df861bfdb2c..e187664eaca4 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -103,8 +103,8 @@ MODULE_PARM_DESC(timeout,
103 "Watchdog timeout in seconds. 0<= timeout <=30, default=" 103 "Watchdog timeout in seconds. 0<= timeout <=30, default="
104 __MODULE_STRING(WATCHDOG_TIMEOUT) "."); 104 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
105 105
106static int nowayout = WATCHDOG_NOWAYOUT; 106static bool nowayout = WATCHDOG_NOWAYOUT;
107module_param(nowayout, int, 0); 107module_param(nowayout, bool, 0);
108MODULE_PARM_DESC(nowayout, 108MODULE_PARM_DESC(nowayout,
109 "Watchdog cannot be stopped once started (default=" 109 "Watchdog cannot be stopped once started (default="
110 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 110 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index 6cd496915eb0..bc3fb8fe89ab 100644
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -60,7 +60,7 @@ enum {
60#define SPRUCE_ASR_TOGGLE_MASK 0x02 /* bit 0: 0, then 1, then 0 */ 60#define SPRUCE_ASR_TOGGLE_MASK 0x02 /* bit 0: 0, then 1, then 0 */
61 61
62 62
63static int nowayout = WATCHDOG_NOWAYOUT; 63static bool nowayout = WATCHDOG_NOWAYOUT;
64 64
65static unsigned long asr_is_open; 65static unsigned long asr_is_open;
66static char asr_expect_close; 66static char asr_expect_close;
@@ -411,7 +411,7 @@ static void __exit ibmasr_exit(void)
411module_init(ibmasr_init); 411module_init(ibmasr_init);
412module_exit(ibmasr_exit); 412module_exit(ibmasr_exit);
413 413
414module_param(nowayout, int, 0); 414module_param(nowayout, bool, 0);
415MODULE_PARM_DESC(nowayout, 415MODULE_PARM_DESC(nowayout,
416 "Watchdog cannot be stopped once started (default=" 416 "Watchdog cannot be stopped once started (default="
417 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 417 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index d34a426ad178..7a2b734fcdc7 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -68,8 +68,8 @@ static struct {
68 68
69static struct miscdevice imx2_wdt_miscdev; 69static struct miscdevice imx2_wdt_miscdev;
70 70
71static int nowayout = WATCHDOG_NOWAYOUT; 71static bool nowayout = WATCHDOG_NOWAYOUT;
72module_param(nowayout, int, 0); 72module_param(nowayout, bool, 0);
73MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 73MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
74 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 74 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
75 75
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 5fa5b2d25e8f..6d90f7a2ce22 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -33,8 +33,8 @@ static DEFINE_SPINLOCK(indydog_lock);
33 33
34#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */ 34#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */
35 35
36static int nowayout = WATCHDOG_NOWAYOUT; 36static bool nowayout = WATCHDOG_NOWAYOUT;
37module_param(nowayout, int, 0); 37module_param(nowayout, bool, 0);
38MODULE_PARM_DESC(nowayout, 38MODULE_PARM_DESC(nowayout,
39 "Watchdog cannot be stopped once started (default=" 39 "Watchdog cannot be stopped once started (default="
40 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 40 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index add259b1887c..d964faf1a250 100644
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -36,7 +36,7 @@
36#include <linux/uaccess.h> 36#include <linux/uaccess.h>
37#include <mach/hardware.h> 37#include <mach/hardware.h>
38 38
39static int nowayout = WATCHDOG_NOWAYOUT; 39static bool nowayout = WATCHDOG_NOWAYOUT;
40static unsigned long wdt_status; 40static unsigned long wdt_status;
41static unsigned long boot_status; 41static unsigned long boot_status;
42static DEFINE_SPINLOCK(wdt_lock); 42static DEFINE_SPINLOCK(wdt_lock);
@@ -253,7 +253,7 @@ static void __exit iop_wdt_exit(void)
253module_init(iop_wdt_init); 253module_init(iop_wdt_init);
254module_exit(iop_wdt_exit); 254module_exit(iop_wdt_exit);
255 255
256module_param(nowayout, int, 0); 256module_param(nowayout, bool, 0);
257MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 257MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
258 258
259MODULE_AUTHOR("Curt E Bruns <curt.e.bruns@intel.com>"); 259MODULE_AUTHOR("Curt E Bruns <curt.e.bruns@intel.com>");
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index ebd1793b9565..f4cce6d66a55 100644
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
@@ -48,8 +48,8 @@ static int margin = 60; /* in seconds */
48module_param(margin, int, 0); 48module_param(margin, int, 0);
49MODULE_PARM_DESC(margin, "Watchdog margin in seconds"); 49MODULE_PARM_DESC(margin, "Watchdog margin in seconds");
50 50
51static int nowayout = WATCHDOG_NOWAYOUT; 51static bool nowayout = WATCHDOG_NOWAYOUT;
52module_param(nowayout, int, 0); 52module_param(nowayout, bool, 0);
53MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); 53MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
54 54
55static unsigned long wdt_open; 55static unsigned long wdt_open;
diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c
index 86b368857ce2..405ae7be7c6f 100644
--- a/drivers/watchdog/it87_wdt.c
+++ b/drivers/watchdog/it87_wdt.c
@@ -143,7 +143,7 @@ static int nogameport = DEFAULT_NOGAMEPORT;
143static int exclusive = DEFAULT_EXCLUSIVE; 143static int exclusive = DEFAULT_EXCLUSIVE;
144static int timeout = DEFAULT_TIMEOUT; 144static int timeout = DEFAULT_TIMEOUT;
145static int testmode = DEFAULT_TESTMODE; 145static int testmode = DEFAULT_TESTMODE;
146static int nowayout = DEFAULT_NOWAYOUT; 146static bool nowayout = DEFAULT_NOWAYOUT;
147 147
148module_param(nogameport, int, 0); 148module_param(nogameport, int, 0);
149MODULE_PARM_DESC(nogameport, "Forbid the activation of game port, default=" 149MODULE_PARM_DESC(nogameport, "Forbid the activation of game port, default="
@@ -157,7 +157,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, default="
157module_param(testmode, int, 0); 157module_param(testmode, int, 0);
158MODULE_PARM_DESC(testmode, "Watchdog test mode (1 = no reboot), default=" 158MODULE_PARM_DESC(testmode, "Watchdog test mode (1 = no reboot), default="
159 __MODULE_STRING(DEFAULT_TESTMODE)); 159 __MODULE_STRING(DEFAULT_TESTMODE));
160module_param(nowayout, int, 0); 160module_param(nowayout, bool, 0);
161MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started, default=" 161MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started, default="
162 __MODULE_STRING(WATCHDOG_NOWAYOUT)); 162 __MODULE_STRING(WATCHDOG_NOWAYOUT));
163 163
diff --git a/drivers/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c
index fc603c5558fc..3f047a58d3ae 100644
--- a/drivers/watchdog/ixp2000_wdt.c
+++ b/drivers/watchdog/ixp2000_wdt.c
@@ -31,7 +31,7 @@
31#include <linux/uaccess.h> 31#include <linux/uaccess.h>
32#include <mach/hardware.h> 32#include <mach/hardware.h>
33 33
34static int nowayout = WATCHDOG_NOWAYOUT; 34static bool nowayout = WATCHDOG_NOWAYOUT;
35static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */ 35static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */
36static unsigned long wdt_status; 36static unsigned long wdt_status;
37static DEFINE_SPINLOCK(wdt_lock); 37static DEFINE_SPINLOCK(wdt_lock);
@@ -207,7 +207,7 @@ MODULE_DESCRIPTION("IXP2000 Network Processor Watchdog");
207module_param(heartbeat, int, 0); 207module_param(heartbeat, int, 0);
208MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)"); 208MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)");
209 209
210module_param(nowayout, int, 0); 210module_param(nowayout, bool, 0);
211MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 211MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
212 212
213MODULE_LICENSE("GPL"); 213MODULE_LICENSE("GPL");
diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 792f95cfac85..5580b4fff7fe 100644
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -27,7 +27,7 @@
27#include <linux/uaccess.h> 27#include <linux/uaccess.h>
28#include <mach/hardware.h> 28#include <mach/hardware.h>
29 29
30static int nowayout = WATCHDOG_NOWAYOUT; 30static bool nowayout = WATCHDOG_NOWAYOUT;
31static int heartbeat = 60; /* (secs) Default is 1 minute */ 31static int heartbeat = 60; /* (secs) Default is 1 minute */
32static unsigned long wdt_status; 32static unsigned long wdt_status;
33static unsigned long boot_status; 33static unsigned long boot_status;
@@ -204,7 +204,7 @@ MODULE_DESCRIPTION("IXP4xx Network Processor Watchdog");
204module_param(heartbeat, int, 0); 204module_param(heartbeat, int, 0);
205MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)"); 205MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)");
206 206
207module_param(nowayout, int, 0); 207module_param(nowayout, bool, 0);
208MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 208MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
209 209
210MODULE_LICENSE("GPL"); 210MODULE_LICENSE("GPL");
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 4ee0c7119b45..59e75d9a6b7f 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -30,14 +30,14 @@
30#define WDT_MAX_TIME 171 /* seconds */ 30#define WDT_MAX_TIME 171 /* seconds */
31 31
32static int wdt_time = WDT_DEFAULT_TIME; 32static int wdt_time = WDT_DEFAULT_TIME;
33static int nowayout = WATCHDOG_NOWAYOUT; 33static bool nowayout = WATCHDOG_NOWAYOUT;
34 34
35module_param(wdt_time, int, 0); 35module_param(wdt_time, int, 0);
36MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default=" 36MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
37 __MODULE_STRING(WDT_DEFAULT_TIME) ")"); 37 __MODULE_STRING(WDT_DEFAULT_TIME) ")");
38 38
39#ifdef CONFIG_WATCHDOG_NOWAYOUT 39#ifdef CONFIG_WATCHDOG_NOWAYOUT
40module_param(nowayout, int, 0); 40module_param(nowayout, bool, 0);
41MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 41MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
42 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 42 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
43#endif 43#endif
diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c
index 83044351042c..a9593a3a32a0 100644
--- a/drivers/watchdog/lantiq_wdt.c
+++ b/drivers/watchdog/lantiq_wdt.c
@@ -40,7 +40,7 @@
40#define LTQ_WDT_DIVIDER 0x40000 40#define LTQ_WDT_DIVIDER 0x40000
41#define LTQ_MAX_TIMEOUT ((1 << 16) - 1) /* the reload field is 16 bit */ 41#define LTQ_MAX_TIMEOUT ((1 << 16) - 1) /* the reload field is 16 bit */
42 42
43static int nowayout = WATCHDOG_NOWAYOUT; 43static bool nowayout = WATCHDOG_NOWAYOUT;
44 44
45static void __iomem *ltq_wdt_membase; 45static void __iomem *ltq_wdt_membase;
46static unsigned long ltq_io_region_clk_rate; 46static unsigned long ltq_io_region_clk_rate;
@@ -251,7 +251,7 @@ exit_ltq_wdt(void)
251module_init(init_ltq_wdt); 251module_init(init_ltq_wdt);
252module_exit(exit_ltq_wdt); 252module_exit(exit_ltq_wdt);
253 253
254module_param(nowayout, int, 0); 254module_param(nowayout, bool, 0);
255MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 255MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
256 256
257MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); 257MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
index 88e6c8ba4176..663cad86c633 100644
--- a/drivers/watchdog/m54xx_wdt.c
+++ b/drivers/watchdog/m54xx_wdt.c
@@ -34,7 +34,7 @@
34#include <asm/m54xxsim.h> 34#include <asm/m54xxsim.h>
35#include <asm/m54xxgpt.h> 35#include <asm/m54xxgpt.h>
36 36
37static int nowayout = WATCHDOG_NOWAYOUT; 37static bool nowayout = WATCHDOG_NOWAYOUT;
38static unsigned int heartbeat = 30; /* (secs) Default is 0.5 minute */ 38static unsigned int heartbeat = 30; /* (secs) Default is 0.5 minute */
39static unsigned long wdt_status; 39static unsigned long wdt_status;
40 40
@@ -220,7 +220,7 @@ MODULE_DESCRIPTION("Coldfire M54xx Watchdog");
220module_param(heartbeat, int, 0); 220module_param(heartbeat, int, 0);
221MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 30s)"); 221MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 30s)");
222 222
223module_param(nowayout, int, 0); 223module_param(nowayout, bool, 0);
224MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 224MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
225 225
226MODULE_LICENSE("GPL"); 226MODULE_LICENSE("GPL");
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c
index a2ecc9656920..52ed8834cedb 100644
--- a/drivers/watchdog/machzwd.c
+++ b/drivers/watchdog/machzwd.c
@@ -95,8 +95,8 @@ MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver");
95MODULE_LICENSE("GPL"); 95MODULE_LICENSE("GPL");
96MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 96MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
97 97
98static int nowayout = WATCHDOG_NOWAYOUT; 98static bool nowayout = WATCHDOG_NOWAYOUT;
99module_param(nowayout, int, 0); 99module_param(nowayout, bool, 0);
100MODULE_PARM_DESC(nowayout, 100MODULE_PARM_DESC(nowayout,
101 "Watchdog cannot be stopped once started (default=" 101 "Watchdog cannot be stopped once started (default="
102 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 102 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index af63ecfbfa6f..c9e9ff2a9c9d 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -34,7 +34,7 @@
34#define MAX_HEARTBEAT 60 34#define MAX_HEARTBEAT 60
35 35
36static int heartbeat = DEFAULT_HEARTBEAT; 36static int heartbeat = DEFAULT_HEARTBEAT;
37static int nowayout = WATCHDOG_NOWAYOUT; 37static bool nowayout = WATCHDOG_NOWAYOUT;
38 38
39/* 39/*
40 * Memory mapping: a single byte, 3 first lower bits to select bit 3 40 * Memory mapping: a single byte, 3 first lower bits to select bit 3
@@ -375,7 +375,7 @@ MODULE_PARM_DESC(heartbeat,
375 __MODULE_STRING(MAX_HEARTBEAT) ", default " 375 __MODULE_STRING(MAX_HEARTBEAT) ", default "
376 __MODULE_STRING(DEFAULT_HEARTBEAT)); 376 __MODULE_STRING(DEFAULT_HEARTBEAT));
377 377
378module_param(nowayout, int, 0); 378module_param(nowayout, bool, 0);
379MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 379MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
380 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 380 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
381 381
diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c
index 17ec5b9dddd2..37e4b52dbce9 100644
--- a/drivers/watchdog/mixcomwd.c
+++ b/drivers/watchdog/mixcomwd.c
@@ -108,8 +108,8 @@ static int mixcomwd_timer_alive;
108static DEFINE_TIMER(mixcomwd_timer, mixcomwd_timerfun, 0, 0); 108static DEFINE_TIMER(mixcomwd_timer, mixcomwd_timerfun, 0, 0);
109static char expect_close; 109static char expect_close;
110 110
111static int nowayout = WATCHDOG_NOWAYOUT; 111static bool nowayout = WATCHDOG_NOWAYOUT;
112module_param(nowayout, int, 0); 112module_param(nowayout, bool, 0);
113MODULE_PARM_DESC(nowayout, 113MODULE_PARM_DESC(nowayout,
114 "Watchdog cannot be stopped once started (default=" 114 "Watchdog cannot be stopped once started (default="
115 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 115 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 3e335fa0f17d..40f7bf1f8654 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -62,8 +62,8 @@ module_param(reset, bool, 0);
62MODULE_PARM_DESC(reset, 62MODULE_PARM_DESC(reset,
63 "Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset"); 63 "Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset");
64 64
65static int nowayout = WATCHDOG_NOWAYOUT; 65static bool nowayout = WATCHDOG_NOWAYOUT;
66module_param(nowayout, int, 0); 66module_param(nowayout, bool, 0);
67MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 67MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
68 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 68 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
69 69
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index a7de5f6bf688..9e83f333b250 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -57,8 +57,8 @@ MODULE_PARM_DESC(mpcore_margin,
57 "MPcore timer margin in seconds. (0 < mpcore_margin < 65536, default=" 57 "MPcore timer margin in seconds. (0 < mpcore_margin < 65536, default="
58 __MODULE_STRING(TIMER_MARGIN) ")"); 58 __MODULE_STRING(TIMER_MARGIN) ")");
59 59
60static int nowayout = WATCHDOG_NOWAYOUT; 60static bool nowayout = WATCHDOG_NOWAYOUT;
61module_param(nowayout, int, 0); 61module_param(nowayout, bool, 0);
62MODULE_PARM_DESC(nowayout, 62MODULE_PARM_DESC(nowayout,
63 "Watchdog cannot be stopped once started (default=" 63 "Watchdog cannot be stopped once started (default="
64 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 64 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index ee0f828bb34f..c53d025e70df 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -60,8 +60,8 @@ static unsigned int bus_clk;
60static char expect_close; 60static char expect_close;
61static DEFINE_SPINLOCK(mv64x60_wdt_spinlock); 61static DEFINE_SPINLOCK(mv64x60_wdt_spinlock);
62 62
63static int nowayout = WATCHDOG_NOWAYOUT; 63static bool nowayout = WATCHDOG_NOWAYOUT;
64module_param(nowayout, int, 0); 64module_param(nowayout, bool, 0);
65MODULE_PARM_DESC(nowayout, 65MODULE_PARM_DESC(nowayout,
66 "Watchdog cannot be stopped once started (default=" 66 "Watchdog cannot be stopped once started (default="
67 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 67 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index 529085b8b8fb..ea4c7448b754 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -55,8 +55,8 @@ module_param(heartbeat, int, 0);
55MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " 55MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
56 "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")"); 56 "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
57 57
58static int nowayout = WATCHDOG_NOWAYOUT; 58static bool nowayout = WATCHDOG_NOWAYOUT;
59module_param(nowayout, int, 0); 59module_param(nowayout, bool, 0);
60MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 60MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
61 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 61 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
62 62
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index 16d9413a81c1..6bbb9efc6125 100644
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -61,8 +61,8 @@ module_param(heartbeat, int, 0);
61MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, " 61MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, "
62 "default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 62 "default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
63 63
64static int nowayout = WATCHDOG_NOWAYOUT; 64static bool nowayout = WATCHDOG_NOWAYOUT;
65module_param(nowayout, int, 0); 65module_param(nowayout, bool, 0);
66MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started" 66MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"
67 " (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 67 " (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
68 68
diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c
index c5a3ff957b8e..461208831428 100644
--- a/drivers/watchdog/octeon-wdt-main.c
+++ b/drivers/watchdog/octeon-wdt-main.c
@@ -97,8 +97,8 @@ MODULE_PARM_DESC(heartbeat,
97 "Watchdog heartbeat in seconds. (0 < heartbeat, default=" 97 "Watchdog heartbeat in seconds. (0 < heartbeat, default="
98 __MODULE_STRING(WD_TIMO) ")"); 98 __MODULE_STRING(WD_TIMO) ")");
99 99
100static int nowayout = WATCHDOG_NOWAYOUT; 100static bool nowayout = WATCHDOG_NOWAYOUT;
101module_param(nowayout, int, S_IRUGO); 101module_param(nowayout, bool, S_IRUGO);
102MODULE_PARM_DESC(nowayout, 102MODULE_PARM_DESC(nowayout,
103 "Watchdog cannot be stopped once started (default=" 103 "Watchdog cannot be stopped once started (default="
104 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 104 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 25c954d2ffaa..173ddf1ba004 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -38,7 +38,7 @@
38#define WDT_IN_USE 0 38#define WDT_IN_USE 0
39#define WDT_OK_TO_CLOSE 1 39#define WDT_OK_TO_CLOSE 1
40 40
41static int nowayout = WATCHDOG_NOWAYOUT; 41static bool nowayout = WATCHDOG_NOWAYOUT;
42static int heartbeat = -1; /* module parameter (seconds) */ 42static int heartbeat = -1; /* module parameter (seconds) */
43static unsigned int wdt_max_duration; /* (seconds) */ 43static unsigned int wdt_max_duration; /* (seconds) */
44static unsigned int wdt_tclk; 44static unsigned int wdt_tclk;
@@ -303,7 +303,7 @@ MODULE_DESCRIPTION("Orion Processor Watchdog");
303module_param(heartbeat, int, 0); 303module_param(heartbeat, int, 0);
304MODULE_PARM_DESC(heartbeat, "Initial watchdog heartbeat in seconds"); 304MODULE_PARM_DESC(heartbeat, "Initial watchdog heartbeat in seconds");
305 305
306module_param(nowayout, int, 0); 306module_param(nowayout, bool, 0);
307MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 307MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
308 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 308 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
309 309
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index a86f405b6325..d5bf112e0077 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -66,7 +66,7 @@ static char expect_close; /* is the close expected? */
66 66
67static DEFINE_SPINLOCK(io_lock); /* to guard us from io races */ 67static DEFINE_SPINLOCK(io_lock); /* to guard us from io races */
68 68
69static int nowayout = WATCHDOG_NOWAYOUT; 69static bool nowayout = WATCHDOG_NOWAYOUT;
70 70
71/* -- Low level function ----------------------------------------*/ 71/* -- Low level function ----------------------------------------*/
72 72
@@ -592,7 +592,7 @@ MODULE_PARM_DESC(timeout,
592 "Watchdog timeout in minutes (default=" 592 "Watchdog timeout in minutes (default="
593 __MODULE_STRING(DEFAULT_TIMEOUT) ")."); 593 __MODULE_STRING(DEFAULT_TIMEOUT) ").");
594 594
595module_param(nowayout, int, 0); 595module_param(nowayout, bool, 0);
596MODULE_PARM_DESC(nowayout, 596MODULE_PARM_DESC(nowayout,
597 "Watchdog cannot be stopped once started (default=" 597 "Watchdog cannot be stopped once started (default="
598 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 598 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c
index fe370defc71f..75694cf24f86 100644
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
@@ -204,8 +204,8 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
204 "(2 <= heartbeat <= 7200 or 0=delay-time from dip-switches, default=" 204 "(2 <= heartbeat <= 7200 or 0=delay-time from dip-switches, default="
205 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 205 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
206 206
207static int nowayout = WATCHDOG_NOWAYOUT; 207static bool nowayout = WATCHDOG_NOWAYOUT;
208module_param(nowayout, int, 0); 208module_param(nowayout, bool, 0);
209MODULE_PARM_DESC(nowayout, 209MODULE_PARM_DESC(nowayout,
210 "Watchdog cannot be stopped once started (default=" 210 "Watchdog cannot be stopped once started (default="
211 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 211 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 75f2fa84c500..c891399bed6a 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -146,8 +146,8 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
146 "(0<heartbeat<65536 or 0=delay-time from dip-switches, default=" 146 "(0<heartbeat<65536 or 0=delay-time from dip-switches, default="
147 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 147 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
148 148
149static int nowayout = WATCHDOG_NOWAYOUT; 149static bool nowayout = WATCHDOG_NOWAYOUT;
150module_param(nowayout, int, 0); 150module_param(nowayout, bool, 0);
151MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 151MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
152 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 152 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
153 153
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 3e66a6bbfec5..7b14d1847927 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -87,8 +87,8 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
87 "(0<heartbeat<65536 or 0=delay-time from dip-switches, default=" 87 "(0<heartbeat<65536 or 0=delay-time from dip-switches, default="
88 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 88 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
89 89
90static int nowayout = WATCHDOG_NOWAYOUT; 90static bool nowayout = WATCHDOG_NOWAYOUT;
91module_param(nowayout, int, 0); 91module_param(nowayout, bool, 0);
92MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 92MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
93 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 93 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
94 94
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c
index e2877623ac44..7d3d471f810c 100644
--- a/drivers/watchdog/pika_wdt.c
+++ b/drivers/watchdog/pika_wdt.c
@@ -39,8 +39,8 @@ module_param(heartbeat, int, 0);
39MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " 39MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
40 "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")"); 40 "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
41 41
42static int nowayout = WATCHDOG_NOWAYOUT; 42static bool nowayout = WATCHDOG_NOWAYOUT;
43module_param(nowayout, int, 0); 43module_param(nowayout, bool, 0);
44MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 44MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
45 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 45 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
46 46
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index ae927093cb6d..38fe5488cc96 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -79,7 +79,7 @@
79 79
80#define WDOG_COUNTER_RATE 13000000 /*the counter clock is 13 MHz fixed */ 80#define WDOG_COUNTER_RATE 13000000 /*the counter clock is 13 MHz fixed */
81 81
82static int nowayout = WATCHDOG_NOWAYOUT; 82static bool nowayout = WATCHDOG_NOWAYOUT;
83static int heartbeat = DEFAULT_HEARTBEAT; 83static int heartbeat = DEFAULT_HEARTBEAT;
84 84
85static DEFINE_SPINLOCK(io_lock); 85static DEFINE_SPINLOCK(io_lock);
@@ -321,7 +321,7 @@ MODULE_PARM_DESC(heartbeat,
321 __MODULE_STRING(MAX_HEARTBEAT) ", default " 321 __MODULE_STRING(MAX_HEARTBEAT) ", default "
322 __MODULE_STRING(DEFAULT_HEARTBEAT)); 322 __MODULE_STRING(DEFAULT_HEARTBEAT));
323 323
324module_param(nowayout, int, 0); 324module_param(nowayout, bool, 0);
325MODULE_PARM_DESC(nowayout, 325MODULE_PARM_DESC(nowayout,
326 "Set to 1 to keep watchdog running after device release"); 326 "Set to 1 to keep watchdog running after device release");
327 327
diff --git a/drivers/watchdog/pnx833x_wdt.c b/drivers/watchdog/pnx833x_wdt.c
index 97959e9738e4..1b62a7dfcc95 100644
--- a/drivers/watchdog/pnx833x_wdt.c
+++ b/drivers/watchdog/pnx833x_wdt.c
@@ -55,8 +55,8 @@ module_param(pnx833x_wdt_timeout, int, 0);
55MODULE_PARM_DESC(timeout, "Watchdog timeout in Mhz. (68Mhz clock), default=" 55MODULE_PARM_DESC(timeout, "Watchdog timeout in Mhz. (68Mhz clock), default="
56 __MODULE_STRING(PNX_TIMEOUT_VALUE) "(30 seconds)."); 56 __MODULE_STRING(PNX_TIMEOUT_VALUE) "(30 seconds).");
57 57
58static int nowayout = WATCHDOG_NOWAYOUT; 58static bool nowayout = WATCHDOG_NOWAYOUT;
59module_param(nowayout, int, 0); 59module_param(nowayout, bool, 0);
60MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 60MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
61 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 61 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
62 62
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index 76c9d1cf8cf1..547353a50ebb 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -64,8 +64,8 @@ module_param(timeout, int, 0);
64MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default=" 64MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default="
65 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 65 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
66 66
67static int nowayout = WATCHDOG_NOWAYOUT; 67static bool nowayout = WATCHDOG_NOWAYOUT;
68module_param(nowayout, int, 0); 68module_param(nowayout, bool, 0);
69MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 69MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
70 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 70 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
71 71
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index ce18029011f7..96b598c52dac 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -51,7 +51,7 @@
51#define CONFIG_S3C2410_WATCHDOG_ATBOOT (0) 51#define CONFIG_S3C2410_WATCHDOG_ATBOOT (0)
52#define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME (15) 52#define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME (15)
53 53
54static int nowayout = WATCHDOG_NOWAYOUT; 54static bool nowayout = WATCHDOG_NOWAYOUT;
55static int tmr_margin = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME; 55static int tmr_margin = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME;
56static int tmr_atboot = CONFIG_S3C2410_WATCHDOG_ATBOOT; 56static int tmr_atboot = CONFIG_S3C2410_WATCHDOG_ATBOOT;
57static int soft_noboot; 57static int soft_noboot;
@@ -59,7 +59,7 @@ static int debug;
59 59
60module_param(tmr_margin, int, 0); 60module_param(tmr_margin, int, 0);
61module_param(tmr_atboot, int, 0); 61module_param(tmr_atboot, int, 0);
62module_param(nowayout, int, 0); 62module_param(nowayout, bool, 0);
63module_param(soft_noboot, int, 0); 63module_param(soft_noboot, int, 0);
64module_param(debug, int, 0); 64module_param(debug, int, 0);
65 65
diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
index 1d0c971d8857..6b41276755bc 100644
--- a/drivers/watchdog/sbc60xxwdt.c
+++ b/drivers/watchdog/sbc60xxwdt.c
@@ -107,8 +107,8 @@ MODULE_PARM_DESC(timeout,
107 "Watchdog timeout in seconds. (1<=timeout<=3600, default=" 107 "Watchdog timeout in seconds. (1<=timeout<=3600, default="
108 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 108 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
109 109
110static int nowayout = WATCHDOG_NOWAYOUT; 110static bool nowayout = WATCHDOG_NOWAYOUT;
111module_param(nowayout, int, 0); 111module_param(nowayout, bool, 0);
112MODULE_PARM_DESC(nowayout, 112MODULE_PARM_DESC(nowayout,
113 "Watchdog cannot be stopped once started (default=" 113 "Watchdog cannot be stopped once started (default="
114 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 114 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index 77cb302754db..8ab757d3df5f 100644
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -47,8 +47,8 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<="
47 __MODULE_STRING(SBC7240_MAX_TIMEOUT) ", default=" 47 __MODULE_STRING(SBC7240_MAX_TIMEOUT) ", default="
48 __MODULE_STRING(SBC7240_TIMEOUT) ")"); 48 __MODULE_STRING(SBC7240_TIMEOUT) ")");
49 49
50static int nowayout = WATCHDOG_NOWAYOUT; 50static bool nowayout = WATCHDOG_NOWAYOUT;
51module_param(nowayout, int, 0); 51module_param(nowayout, bool, 0);
52MODULE_PARM_DESC(nowayout, "Disable watchdog when closing device file"); 52MODULE_PARM_DESC(nowayout, "Disable watchdog when closing device file");
53 53
54#define SBC7240_OPEN_STATUS_BIT 0 54#define SBC7240_OPEN_STATUS_BIT 0
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c
index f72b6e013a93..a9ea385fa125 100644
--- a/drivers/watchdog/sbc8360.c
+++ b/drivers/watchdog/sbc8360.c
@@ -197,11 +197,11 @@ static int wd_times[64][2] = {
197static int timeout = 27; 197static int timeout = 27;
198static int wd_margin = 0xB; 198static int wd_margin = 0xB;
199static int wd_multiplier = 2; 199static int wd_multiplier = 2;
200static int nowayout = WATCHDOG_NOWAYOUT; 200static bool nowayout = WATCHDOG_NOWAYOUT;
201 201
202module_param(timeout, int, 0); 202module_param(timeout, int, 0);
203MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); 203MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))");
204module_param(nowayout, int, 0); 204module_param(nowayout, bool, 0);
205MODULE_PARM_DESC(nowayout, 205MODULE_PARM_DESC(nowayout,
206 "Watchdog cannot be stopped once started (default=" 206 "Watchdog cannot be stopped once started (default="
207 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 207 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index 1a13d36c5f12..0c3e9f66ef77 100644
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -34,8 +34,8 @@ static int epx_c3_alive;
34 34
35#define WATCHDOG_TIMEOUT 1 /* 1 sec default timeout */ 35#define WATCHDOG_TIMEOUT 1 /* 1 sec default timeout */
36 36
37static int nowayout = WATCHDOG_NOWAYOUT; 37static bool nowayout = WATCHDOG_NOWAYOUT;
38module_param(nowayout, int, 0); 38module_param(nowayout, bool, 0);
39MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 39MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
40 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 40 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
41 41
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index ca9c6c4360ee..840428529227 100644
--- a/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@ -27,7 +27,7 @@
27 27
28#include <asm/system.h> 28#include <asm/system.h>
29 29
30static int nowayout = WATCHDOG_NOWAYOUT; 30static bool nowayout = WATCHDOG_NOWAYOUT;
31static unsigned int margin = 60; /* (secs) Default is 1 minute */ 31static unsigned int margin = 60; /* (secs) Default is 1 minute */
32static unsigned long wdt_status; 32static unsigned long wdt_status;
33static DEFINE_MUTEX(wdt_lock); 33static DEFINE_MUTEX(wdt_lock);
@@ -260,7 +260,7 @@ MODULE_DESCRIPTION("SBC-FITPC2 Watchdog");
260module_param(margin, int, 0); 260module_param(margin, int, 0);
261MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)"); 261MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)");
262 262
263module_param(nowayout, int, 0); 263module_param(nowayout, bool, 0);
264MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 264MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
265 265
266MODULE_LICENSE("GPL"); 266MODULE_LICENSE("GPL");
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 0698b3d794ea..3fb83b0c28c2 100644
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -93,8 +93,8 @@ MODULE_PARM_DESC(io, "io port");
93module_param(timeout, int, 0); 93module_param(timeout, int, 0);
94MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1"); 94MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1");
95 95
96static int nowayout = WATCHDOG_NOWAYOUT; 96static bool nowayout = WATCHDOG_NOWAYOUT;
97module_param(nowayout, int, 0); 97module_param(nowayout, bool, 0);
98MODULE_PARM_DESC(nowayout, 98MODULE_PARM_DESC(nowayout,
99 "Watchdog cannot be stopped once started (default=" 99 "Watchdog cannot be stopped once started (default="
100 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 100 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c
index e975b3354381..d1ef58579a37 100644
--- a/drivers/watchdog/sc520_wdt.c
+++ b/drivers/watchdog/sc520_wdt.c
@@ -97,8 +97,8 @@ MODULE_PARM_DESC(timeout,
97 "Watchdog timeout in seconds. (1 <= timeout <= 3600, default=" 97 "Watchdog timeout in seconds. (1 <= timeout <= 3600, default="
98 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 98 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
99 99
100static int nowayout = WATCHDOG_NOWAYOUT; 100static bool nowayout = WATCHDOG_NOWAYOUT;
101module_param(nowayout, int, 0); 101module_param(nowayout, bool, 0);
102MODULE_PARM_DESC(nowayout, 102MODULE_PARM_DESC(nowayout,
103 "Watchdog cannot be stopped once started (default=" 103 "Watchdog cannot be stopped once started (default="
104 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 104 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index 1702c3e9bce3..bd86f32d63ab 100644
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -80,8 +80,8 @@ MODULE_PARM_DESC(timeout,
80 "Watchdog timeout in seconds. 1<= timeout <=15300, default=" 80 "Watchdog timeout in seconds. 1<= timeout <=15300, default="
81 __MODULE_STRING(WATCHDOG_TIMEOUT) "."); 81 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
82 82
83static int nowayout = WATCHDOG_NOWAYOUT; 83static bool nowayout = WATCHDOG_NOWAYOUT;
84module_param(nowayout, int, 0); 84module_param(nowayout, bool, 0);
85MODULE_PARM_DESC(nowayout, 85MODULE_PARM_DESC(nowayout,
86 "Watchdog cannot be stopped once started (default=" 86 "Watchdog cannot be stopped once started (default="
87 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 87 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/scx200_wdt.c b/drivers/watchdog/scx200_wdt.c
index 35ada2e90664..8ae7c282d465 100644
--- a/drivers/watchdog/scx200_wdt.c
+++ b/drivers/watchdog/scx200_wdt.c
@@ -43,8 +43,8 @@ static int margin = 60; /* in seconds */
43module_param(margin, int, 0); 43module_param(margin, int, 0);
44MODULE_PARM_DESC(margin, "Watchdog margin in seconds"); 44MODULE_PARM_DESC(margin, "Watchdog margin in seconds");
45 45
46static int nowayout = WATCHDOG_NOWAYOUT; 46static bool nowayout = WATCHDOG_NOWAYOUT;
47module_param(nowayout, int, 0); 47module_param(nowayout, bool, 0);
48MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); 48MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
49 49
50static u16 wdto_restart; 50static u16 wdto_restart;
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index 75bd23926476..93958a7763e6 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -75,7 +75,7 @@ static DEFINE_SPINLOCK(shwdt_lock);
75 75
76#define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */ 76#define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */
77static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */ 77static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */
78static int nowayout = WATCHDOG_NOWAYOUT; 78static bool nowayout = WATCHDOG_NOWAYOUT;
79static unsigned long next_heartbeat; 79static unsigned long next_heartbeat;
80 80
81struct sh_wdt { 81struct sh_wdt {
@@ -484,7 +484,7 @@ MODULE_PARM_DESC(heartbeat,
484 "Watchdog heartbeat in seconds. (1 <= heartbeat <= 3600, default=" 484 "Watchdog heartbeat in seconds. (1 <= heartbeat <= 3600, default="
485 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 485 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
486 486
487module_param(nowayout, int, 0); 487module_param(nowayout, bool, 0);
488MODULE_PARM_DESC(nowayout, 488MODULE_PARM_DESC(nowayout,
489 "Watchdog cannot be stopped once started (default=" 489 "Watchdog cannot be stopped once started (default="
490 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 490 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index 5e4d3734b516..4c3400574ada 100644
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -86,7 +86,7 @@ static char expect_close; /* is the close expected? */
86 86
87static DEFINE_SPINLOCK(io_lock);/* to guard the watchdog from io races */ 87static DEFINE_SPINLOCK(io_lock);/* to guard the watchdog from io races */
88 88
89static int nowayout = WATCHDOG_NOWAYOUT; 89static bool nowayout = WATCHDOG_NOWAYOUT;
90 90
91/* -- Low level function ----------------------------------------*/ 91/* -- Low level function ----------------------------------------*/
92 92
@@ -615,7 +615,7 @@ MODULE_PARM_DESC(unit,
615module_param(timeout, int, 0); 615module_param(timeout, int, 0);
616MODULE_PARM_DESC(timeout, "range is 1-255 units, default is 60"); 616MODULE_PARM_DESC(timeout, "range is 1-255 units, default is 60");
617 617
618module_param(nowayout, int, 0); 618module_param(nowayout, bool, 0);
619MODULE_PARM_DESC(nowayout, 619MODULE_PARM_DESC(nowayout,
620 "Watchdog cannot be stopped once started (default=" 620 "Watchdog cannot be stopped once started (default="
621 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 621 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index a1adc8c87832..da8620f829b2 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -59,8 +59,8 @@ MODULE_PARM_DESC(soft_margin,
59 "Watchdog soft_margin in seconds. (0 < soft_margin < 65536, default=" 59 "Watchdog soft_margin in seconds. (0 < soft_margin < 65536, default="
60 __MODULE_STRING(TIMER_MARGIN) ")"); 60 __MODULE_STRING(TIMER_MARGIN) ")");
61 61
62static int nowayout = WATCHDOG_NOWAYOUT; 62static bool nowayout = WATCHDOG_NOWAYOUT;
63module_param(nowayout, int, 0); 63module_param(nowayout, bool, 0);
64MODULE_PARM_DESC(nowayout, 64MODULE_PARM_DESC(nowayout,
65 "Watchdog cannot be stopped once started (default=" 65 "Watchdog cannot be stopped once started (default="
66 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 66 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
index 954a7b6334c4..59108e48ada3 100644
--- a/drivers/watchdog/sp5100_tco.c
+++ b/drivers/watchdog/sp5100_tco.c
@@ -62,8 +62,8 @@ module_param(heartbeat, int, 0);
62MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default=" 62MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default="
63 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); 63 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
64 64
65static int nowayout = WATCHDOG_NOWAYOUT; 65static bool nowayout = WATCHDOG_NOWAYOUT;
66module_param(nowayout, int, 0); 66module_param(nowayout, bool, 0);
67MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started" 67MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"
68 " (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 68 " (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
69 69
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 2b0939ab61da..49b615a29c4c 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -79,7 +79,7 @@ struct sp805_wdt {
79 79
80/* local variables */ 80/* local variables */
81static struct sp805_wdt *wdt; 81static struct sp805_wdt *wdt;
82static int nowayout = WATCHDOG_NOWAYOUT; 82static bool nowayout = WATCHDOG_NOWAYOUT;
83 83
84/* This routine finds load value that will reset system in required timout */ 84/* This routine finds load value that will reset system in required timout */
85static void wdt_setload(unsigned int timeout) 85static void wdt_setload(unsigned int timeout)
@@ -405,7 +405,7 @@ static struct amba_driver sp805_wdt_driver = {
405 405
406module_amba_driver(sp805_wdt_driver); 406module_amba_driver(sp805_wdt_driver);
407 407
408module_param(nowayout, int, 0); 408module_param(nowayout, bool, 0);
409MODULE_PARM_DESC(nowayout, 409MODULE_PARM_DESC(nowayout,
410 "Set to 1 to keep watchdog running after device release"); 410 "Set to 1 to keep watchdog running after device release");
411 411
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
index 180941375cec..21d96b92bfd7 100644
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ b/drivers/watchdog/stmp3xxx_wdt.c
@@ -35,7 +35,7 @@
35 35
36static DEFINE_SPINLOCK(stmp3xxx_wdt_io_lock); 36static DEFINE_SPINLOCK(stmp3xxx_wdt_io_lock);
37static unsigned long wdt_status; 37static unsigned long wdt_status;
38static const int nowayout = WATCHDOG_NOWAYOUT; 38static const bool nowayout = WATCHDOG_NOWAYOUT;
39static int heartbeat = DEFAULT_HEARTBEAT; 39static int heartbeat = DEFAULT_HEARTBEAT;
40static unsigned long boot_status; 40static unsigned long boot_status;
41 41
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index 1490293dc7da..8df050d800e6 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -34,8 +34,8 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. "
34 __MODULE_STRING(TS72XX_WDT_DEFAULT_TIMEOUT) 34 __MODULE_STRING(TS72XX_WDT_DEFAULT_TIMEOUT)
35 ")"); 35 ")");
36 36
37static int nowayout = WATCHDOG_NOWAYOUT; 37static bool nowayout = WATCHDOG_NOWAYOUT;
38module_param(nowayout, int, 0); 38module_param(nowayout, bool, 0);
39MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); 39MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
40 40
41/** 41/**
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 0764c6239b98..249f11305d26 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -42,8 +42,8 @@ struct twl4030_wdt {
42 unsigned long state; 42 unsigned long state;
43}; 43};
44 44
45static int nowayout = WATCHDOG_NOWAYOUT; 45static bool nowayout = WATCHDOG_NOWAYOUT;
46module_param(nowayout, int, 0); 46module_param(nowayout, bool, 0);
47MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 47MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
48 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 48 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
49 49
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index 99204a808698..d02804ccd280 100644
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -33,8 +33,8 @@ MODULE_PARM_DESC(timeout,
33 "(0<timeout<((2^" __MODULE_STRING(TXX9_TIMER_BITS) ")/(IMCLK/256)), " 33 "(0<timeout<((2^" __MODULE_STRING(TXX9_TIMER_BITS) ")/(IMCLK/256)), "
34 "default=" __MODULE_STRING(TIMER_MARGIN) ")"); 34 "default=" __MODULE_STRING(TIMER_MARGIN) ")");
35 35
36static int nowayout = WATCHDOG_NOWAYOUT; 36static bool nowayout = WATCHDOG_NOWAYOUT;
37module_param(nowayout, int, 0); 37module_param(nowayout, bool, 0);
38MODULE_PARM_DESC(nowayout, 38MODULE_PARM_DESC(nowayout,
39 "Watchdog cannot be stopped once started " 39 "Watchdog cannot be stopped once started "
40 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 40 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index bacbbc9e7443..ef83f0242411 100644
--- a/drivers/watchdog/via_wdt.c
+++ b/drivers/watchdog/via_wdt.c
@@ -58,8 +58,8 @@ module_param(timeout, int, 0);
58MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, between 1 and 1023 " 58MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, between 1 and 1023 "
59 "(default = " __MODULE_STRING(WDT_TIMEOUT) ")"); 59 "(default = " __MODULE_STRING(WDT_TIMEOUT) ")");
60 60
61static int nowayout = WATCHDOG_NOWAYOUT; 61static bool nowayout = WATCHDOG_NOWAYOUT;
62module_param(nowayout, int, 0); 62module_param(nowayout, bool, 0);
63MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " 63MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
64 "(default = " __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 64 "(default = " __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
65 65
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 969358732841..452980361c63 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -62,8 +62,8 @@ MODULE_PARM_DESC(timeout,
62 "Watchdog timeout in seconds. 1 <= timeout <= 255, default=" 62 "Watchdog timeout in seconds. 1 <= timeout <= 255, default="
63 __MODULE_STRING(WATCHDOG_TIMEOUT) "."); 63 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
64 64
65static int nowayout = WATCHDOG_NOWAYOUT; 65static bool nowayout = WATCHDOG_NOWAYOUT;
66module_param(nowayout, int, 0); 66module_param(nowayout, bool, 0);
67MODULE_PARM_DESC(nowayout, 67MODULE_PARM_DESC(nowayout,
68 "Watchdog cannot be stopped once started (default=" 68 "Watchdog cannot be stopped once started (default="
69 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 69 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 23074184c214..f5c9d9901acc 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -63,8 +63,8 @@ MODULE_PARM_DESC(timeout,
63 "Watchdog timeout in seconds. 1<= timeout <=255 (default=" 63 "Watchdog timeout in seconds. 1<= timeout <=255 (default="
64 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 64 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
65 65
66static int nowayout = WATCHDOG_NOWAYOUT; 66static bool nowayout = WATCHDOG_NOWAYOUT;
67module_param(nowayout, int, 0); 67module_param(nowayout, bool, 0);
68MODULE_PARM_DESC(nowayout, 68MODULE_PARM_DESC(nowayout,
69 "Watchdog cannot be stopped once started (default=" 69 "Watchdog cannot be stopped once started (default="
70 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 70 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c
index 025736bacf5f..ab45bfdf935c 100644
--- a/drivers/watchdog/w83697ug_wdt.c
+++ b/drivers/watchdog/w83697ug_wdt.c
@@ -65,8 +65,8 @@ MODULE_PARM_DESC(timeout,
65 "Watchdog timeout in seconds. 1<= timeout <=255 (default=" 65 "Watchdog timeout in seconds. 1<= timeout <=255 (default="
66 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 66 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
67 67
68static int nowayout = WATCHDOG_NOWAYOUT; 68static bool nowayout = WATCHDOG_NOWAYOUT;
69module_param(nowayout, int, 0); 69module_param(nowayout, bool, 0);
70MODULE_PARM_DESC(nowayout, 70MODULE_PARM_DESC(nowayout,
71 "Watchdog cannot be stopped once started (default=" 71 "Watchdog cannot be stopped once started (default="
72 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 72 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c
index d761414de809..e76e7e309301 100644
--- a/drivers/watchdog/w83877f_wdt.c
+++ b/drivers/watchdog/w83877f_wdt.c
@@ -92,8 +92,8 @@ MODULE_PARM_DESC(timeout,
92 __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 92 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
93 93
94 94
95static int nowayout = WATCHDOG_NOWAYOUT; 95static bool nowayout = WATCHDOG_NOWAYOUT;
96module_param(nowayout, int, 0); 96module_param(nowayout, bool, 0);
97MODULE_PARM_DESC(nowayout, 97MODULE_PARM_DESC(nowayout,
98 "Watchdog cannot be stopped once started (default=" 98 "Watchdog cannot be stopped once started (default="
99 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 99 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index d301b1bf1664..56bfded1f361 100644
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -59,8 +59,8 @@ MODULE_PARM_DESC(timeout,
59module_param(testmode, int, 0); 59module_param(testmode, int, 0);
60MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0"); 60MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0");
61 61
62static int nowayout = WATCHDOG_NOWAYOUT; 62static bool nowayout = WATCHDOG_NOWAYOUT;
63module_param(nowayout, int, 0); 63module_param(nowayout, bool, 0);
64MODULE_PARM_DESC(nowayout, 64MODULE_PARM_DESC(nowayout,
65 "Watchdog cannot be stopped once started (default=" 65 "Watchdog cannot be stopped once started (default="
66 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 66 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 1dea144017e5..25aba6e00a23 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -67,8 +67,8 @@ MODULE_PARM_DESC(timeout,
67 "Watchdog timeout in seconds. 1 <= timeout <= 255, default=" 67 "Watchdog timeout in seconds. 1 <= timeout <= 255, default="
68 __MODULE_STRING(WD_TIMO) "."); 68 __MODULE_STRING(WD_TIMO) ".");
69 69
70static int nowayout = WATCHDOG_NOWAYOUT; 70static bool nowayout = WATCHDOG_NOWAYOUT;
71module_param(nowayout, int, 0); 71module_param(nowayout, bool, 0);
72MODULE_PARM_DESC(nowayout, 72MODULE_PARM_DESC(nowayout,
73 "Watchdog cannot be stopped once started (default=" 73 "Watchdog cannot be stopped once started (default="
74 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 74 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c
index b7b34600f9a0..0a77655cda60 100644
--- a/drivers/watchdog/wdrtas.c
+++ b/drivers/watchdog/wdrtas.c
@@ -51,7 +51,7 @@ MODULE_LICENSE("GPL");
51MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 51MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
52MODULE_ALIAS_MISCDEV(TEMP_MINOR); 52MODULE_ALIAS_MISCDEV(TEMP_MINOR);
53 53
54static int wdrtas_nowayout = WATCHDOG_NOWAYOUT; 54static bool wdrtas_nowayout = WATCHDOG_NOWAYOUT;
55static atomic_t wdrtas_miscdev_open = ATOMIC_INIT(0); 55static atomic_t wdrtas_miscdev_open = ATOMIC_INIT(0);
56static char wdrtas_expect_close; 56static char wdrtas_expect_close;
57 57
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index 4ef6702fff82..64079d933c63 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -67,8 +67,8 @@ MODULE_PARM_DESC(heartbeat,
67 "Watchdog heartbeat in seconds. (0 < heartbeat < 65536, default=" 67 "Watchdog heartbeat in seconds. (0 < heartbeat < 65536, default="
68 __MODULE_STRING(WD_TIMO) ")"); 68 __MODULE_STRING(WD_TIMO) ")");
69 69
70static int nowayout = WATCHDOG_NOWAYOUT; 70static bool nowayout = WATCHDOG_NOWAYOUT;
71module_param(nowayout, int, 0); 71module_param(nowayout, bool, 0);
72MODULE_PARM_DESC(nowayout, 72MODULE_PARM_DESC(nowayout,
73 "Watchdog cannot be stopped once started (default=" 73 "Watchdog cannot be stopped once started (default="
74 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 74 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c
index cfb0a8cd7f12..2de1632708a0 100644
--- a/drivers/watchdog/wdt977.c
+++ b/drivers/watchdog/wdt977.c
@@ -68,8 +68,8 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (60..15300, default="
68module_param(testmode, int, 0); 68module_param(testmode, int, 0);
69MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0"); 69MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0");
70 70
71static int nowayout = WATCHDOG_NOWAYOUT; 71static bool nowayout = WATCHDOG_NOWAYOUT;
72module_param(nowayout, int, 0); 72module_param(nowayout, bool, 0);
73MODULE_PARM_DESC(nowayout, 73MODULE_PARM_DESC(nowayout,
74 "Watchdog cannot be stopped once started (default=" 74 "Watchdog cannot be stopped once started (default="
75 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 75 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index c099b6fcdf40..a3cea594c8f2 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -80,8 +80,8 @@ MODULE_PARM_DESC(heartbeat,
80 "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" 80 "Watchdog heartbeat in seconds. (0<heartbeat<65536, default="
81 __MODULE_STRING(WD_TIMO) ")"); 81 __MODULE_STRING(WD_TIMO) ")");
82 82
83static int nowayout = WATCHDOG_NOWAYOUT; 83static bool nowayout = WATCHDOG_NOWAYOUT;
84module_param(nowayout, int, 0); 84module_param(nowayout, bool, 0);
85MODULE_PARM_DESC(nowayout, 85MODULE_PARM_DESC(nowayout,
86 "Watchdog cannot be stopped once started (default=" 86 "Watchdog cannot be stopped once started (default="
87 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 87 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index 263c883f0806..b3e8a62f27a9 100644
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -22,8 +22,8 @@
22#include <linux/mfd/wm831x/pdata.h> 22#include <linux/mfd/wm831x/pdata.h>
23#include <linux/mfd/wm831x/watchdog.h> 23#include <linux/mfd/wm831x/watchdog.h>
24 24
25static int nowayout = WATCHDOG_NOWAYOUT; 25static bool nowayout = WATCHDOG_NOWAYOUT;
26module_param(nowayout, int, 0); 26module_param(nowayout, bool, 0);
27MODULE_PARM_DESC(nowayout, 27MODULE_PARM_DESC(nowayout,
28 "Watchdog cannot be stopped once started (default=" 28 "Watchdog cannot be stopped once started (default="
29 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 29 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c
index f18499eaeaa7..cdd2efc6d6b1 100644
--- a/drivers/watchdog/wm8350_wdt.c
+++ b/drivers/watchdog/wm8350_wdt.c
@@ -21,8 +21,8 @@
21#include <linux/uaccess.h> 21#include <linux/uaccess.h>
22#include <linux/mfd/wm8350/core.h> 22#include <linux/mfd/wm8350/core.h>
23 23
24static int nowayout = WATCHDOG_NOWAYOUT; 24static bool nowayout = WATCHDOG_NOWAYOUT;
25module_param(nowayout, int, 0); 25module_param(nowayout, bool, 0);
26MODULE_PARM_DESC(nowayout, 26MODULE_PARM_DESC(nowayout,
27 "Watchdog cannot be stopped once started (default=" 27 "Watchdog cannot be stopped once started (default="
28 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 28 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");