diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 18:02:20 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 18:02:20 -0500 |
commit | 90ab5ee94171b3e28de6bb42ee30b527014e0be7 (patch) | |
tree | fcf89889f6e881f2b231d3d20287c08174ce4b54 /drivers/watchdog | |
parent | 476bc0015bf09dad39d36a8b19f76f0c181d1ec9 (diff) |
module_param: make bool parameters really bool (drivers & misc)
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.
It's time to remove the int/unsigned int option. For this version
it'll simply give a warning, but it'll break next kernel version.
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/f71808e_wdt.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/mpc8xxx_wdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c index d4d8d1fdccc4..e45ca2b4bfbe 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c | |||
@@ -100,7 +100,7 @@ MODULE_PARM_DESC(f71862fg_pin, | |||
100 | "Watchdog f71862fg reset output pin configuration. Choose pin 56 or 63" | 100 | "Watchdog f71862fg reset output pin configuration. Choose pin 56 or 63" |
101 | " (default=" __MODULE_STRING(WATCHDOG_F71862FG_PIN)")"); | 101 | " (default=" __MODULE_STRING(WATCHDOG_F71862FG_PIN)")"); |
102 | 102 | ||
103 | static int nowayout = WATCHDOG_NOWAYOUT; | 103 | static bool nowayout = WATCHDOG_NOWAYOUT; |
104 | module_param(nowayout, bool, 0444); | 104 | module_param(nowayout, bool, 0444); |
105 | MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); | 105 | MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); |
106 | 106 | ||
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index eed5436ffb51..20feb4d3d791 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
@@ -55,7 +55,7 @@ module_param(timeout, ushort, 0); | |||
55 | MODULE_PARM_DESC(timeout, | 55 | MODULE_PARM_DESC(timeout, |
56 | "Watchdog timeout in ticks. (0<timeout<65536, default=65535)"); | 56 | "Watchdog timeout in ticks. (0<timeout<65536, default=65535)"); |
57 | 57 | ||
58 | static int reset = 1; | 58 | static bool reset = 1; |
59 | module_param(reset, bool, 0); | 59 | module_param(reset, bool, 0); |
60 | MODULE_PARM_DESC(reset, | 60 | MODULE_PARM_DESC(reset, |
61 | "Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset"); | 61 | "Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset"); |