From: Wim Van Sebroeck The first patch convert these watchdog modules to the new module_param syntax. The second patch fixes machzwd.c (you need to declare the variable before using the module_param subroutine). 25-akpm/drivers/char/watchdog/acquirewdt.c | 3 ++- 25-akpm/drivers/char/watchdog/alim7101_wdt.c | 3 ++- 25-akpm/drivers/char/watchdog/ib700wdt.c | 3 ++- 25-akpm/drivers/char/watchdog/indydog.c | 3 ++- 25-akpm/drivers/char/watchdog/machzwd.c | 8 +++++--- 25-akpm/drivers/char/watchdog/mixcomwd.c | 3 ++- 25-akpm/drivers/char/watchdog/pcwd.c | 5 +++-- 25-akpm/drivers/char/watchdog/sa1100_wdt.c | 7 +++++-- 25-akpm/drivers/char/watchdog/sbc60xxwdt.c | 3 ++- 25-akpm/drivers/char/watchdog/sc520_wdt.c | 3 ++- 25-akpm/drivers/char/watchdog/scx200_wdt.c | 5 +++-- 25-akpm/drivers/char/watchdog/shwdt.c | 9 ++++++--- 25-akpm/drivers/char/watchdog/softdog.c | 7 ++++--- 25-akpm/drivers/char/watchdog/wafer5823wdt.c | 3 ++- 25-akpm/drivers/char/watchdog/wdt285.c | 3 ++- 25-akpm/drivers/char/watchdog/wdt977.c | 7 ++++--- 25-akpm/drivers/char/watchdog/wdt_pci.c | 3 ++- 17 files changed, 50 insertions(+), 28 deletions(-) diff -puN drivers/char/watchdog/acquirewdt.c~watchdog-module-param-fixes drivers/char/watchdog/acquirewdt.c --- 25/drivers/char/watchdog/acquirewdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/acquirewdt.c Wed Jul 30 15:37:12 2003 @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -55,7 +56,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); /* diff -puN drivers/char/watchdog/alim7101_wdt.c~watchdog-module-param-fixes drivers/char/watchdog/alim7101_wdt.c --- 25/drivers/char/watchdog/alim7101_wdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/alim7101_wdt.c Wed Jul 30 15:37:12 2003 @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -79,7 +80,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); /* diff -puN drivers/char/watchdog/ib700wdt.c~watchdog-module-param-fixes drivers/char/watchdog/ib700wdt.c --- 25/drivers/char/watchdog/ib700wdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/ib700wdt.c Wed Jul 30 15:37:12 2003 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -122,7 +123,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); diff -puN drivers/char/watchdog/indydog.c~watchdog-module-param-fixes drivers/char/watchdog/indydog.c --- 25/drivers/char/watchdog/indydog.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/indydog.c Wed Jul 30 15:37:12 2003 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -33,7 +34,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); static void indydog_ping() diff -puN drivers/char/watchdog/machzwd.c~watchdog-module-param-fixes drivers/char/watchdog/machzwd.c --- 25/drivers/char/watchdog/machzwd.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/machzwd.c Wed Jul 30 15:37:12 2003 @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -97,8 +98,6 @@ static unsigned short zf_readb(unsigned MODULE_AUTHOR("Fernando Fuganti "); MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(action, "i"); -MODULE_PARM_DESC(action, "after watchdog resets, generate: 0 = RESET(*) 1 = SMI 2 = NMI 3 = SCI"); #ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = 1; @@ -106,7 +105,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); #define PFX "machzwd" @@ -127,6 +126,9 @@ static struct watchdog_info zf_info = { * defaults to GEN_RESET (0) */ static int action = 0; +module_param(action, int, 0); +MODULE_PARM_DESC(action, "after watchdog resets, generate: 0 = RESET(*) 1 = SMI 2 = NMI 3 = SCI"); + static int zf_action = GEN_RESET; static int zf_is_open = 0; static int zf_expect_close = 0; diff -puN drivers/char/watchdog/mixcomwd.c~watchdog-module-param-fixes drivers/char/watchdog/mixcomwd.c --- 25/drivers/char/watchdog/mixcomwd.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/mixcomwd.c Wed Jul 30 15:37:12 2003 @@ -36,6 +36,7 @@ #define VERSION "0.5" #include +#include #include #include #include @@ -67,7 +68,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); static void mixcomwd_ping(void) diff -puN drivers/char/watchdog/pcwd.c~watchdog-module-param-fixes drivers/char/watchdog/pcwd.c --- 25/drivers/char/watchdog/pcwd.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/pcwd.c Wed Jul 30 15:37:12 2003 @@ -45,6 +45,7 @@ */ #include +#include #include #include #include @@ -87,7 +88,7 @@ static int timeout_val = WD_TIMEOUT; static int timeout = 2; static int expect_close = 0; -MODULE_PARM(timeout,"i"); +module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=2)"); #ifdef CONFIG_WATCHDOG_NOWAYOUT @@ -96,7 +97,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); diff -puN drivers/char/watchdog/sa1100_wdt.c~watchdog-module-param-fixes drivers/char/watchdog/sa1100_wdt.c --- 25/drivers/char/watchdog/sa1100_wdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/sa1100_wdt.c Wed Jul 30 15:37:12 2003 @@ -19,6 +19,7 @@ */ #include #include +#include #include #include #include @@ -208,9 +209,11 @@ module_exit(sa1100dog_exit); MODULE_AUTHOR("Oleg Drokin "); MODULE_DESCRIPTION("SA1100 Watchdog"); -MODULE_PARM(margin,"i"); + +module_param(margin, int, 0); MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)"); -MODULE_PARM(nowayout, "i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); + MODULE_LICENSE("GPL"); diff -puN drivers/char/watchdog/sbc60xxwdt.c~watchdog-module-param-fixes drivers/char/watchdog/sbc60xxwdt.c --- 25/drivers/char/watchdog/sbc60xxwdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/sbc60xxwdt.c Wed Jul 30 15:37:12 2003 @@ -56,6 +56,7 @@ */ #include +#include #include #include #include @@ -111,7 +112,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); /* diff -puN drivers/char/watchdog/sc520_wdt.c~watchdog-module-param-fixes drivers/char/watchdog/sc520_wdt.c --- 25/drivers/char/watchdog/sc520_wdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/sc520_wdt.c Wed Jul 30 15:37:12 2003 @@ -49,6 +49,7 @@ */ #include +#include #include #include #include @@ -111,7 +112,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); static spinlock_t wdt_spinlock; diff -puN drivers/char/watchdog/scx200_wdt.c~watchdog-module-param-fixes drivers/char/watchdog/scx200_wdt.c --- 25/drivers/char/watchdog/scx200_wdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/scx200_wdt.c Wed Jul 30 15:37:12 2003 @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -41,11 +42,11 @@ MODULE_LICENSE("GPL"); #endif static int margin = 60; /* in seconds */ -MODULE_PARM(margin, "i"); +module_param(margin, int, 0); MODULE_PARM_DESC(margin, "Watchdog margin in seconds"); static int nowayout = CONFIG_WATCHDOG_NOWAYOUT; -MODULE_PARM(nowayout, "i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); static u16 wdto_restart; diff -puN drivers/char/watchdog/shwdt.c~watchdog-module-param-fixes drivers/char/watchdog/shwdt.c --- 25/drivers/char/watchdog/shwdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/shwdt.c Wed Jul 30 15:37:12 2003 @@ -1,5 +1,5 @@ /* - * drivers/char/shwdt.c + * drivers/char/watchdog/shwdt.c * * Watchdog driver for integrated watchdog in the SuperH processors. * @@ -19,6 +19,7 @@ */ #include #include +#include #include #include #include @@ -395,9 +396,11 @@ static void __exit sh_wdt_exit(void) MODULE_AUTHOR("Paul Mundt "); MODULE_DESCRIPTION("SuperH watchdog driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(clock_division_ratio, "i"); + +module_param(clock_division_ratio, int, 0); MODULE_PARM_DESC(clock_division_ratio, "Clock division ratio. Valid ranges are from 0x5 (1.31ms) to 0x7 (5.25ms). Defaults to 0x7."); -MODULE_PARM(nowayout,"i"); + +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); module_init(sh_wdt_init); diff -puN drivers/char/watchdog/softdog.c~watchdog-module-param-fixes drivers/char/watchdog/softdog.c --- 25/drivers/char/watchdog/softdog.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/softdog.c Wed Jul 30 15:37:12 2003 @@ -37,6 +37,7 @@ */ #include +#include #include #include #include @@ -56,8 +57,8 @@ static int soft_noboot = 1; static int soft_noboot = 0; #endif /* ONLY_TESTING */ -MODULE_PARM(soft_margin,"i"); -MODULE_PARM(soft_noboot,"i"); +module_param(soft_margin, int, 0); +module_param(soft_noboot, int, 0); MODULE_LICENSE("GPL"); #ifdef CONFIG_WATCHDOG_NOWAYOUT @@ -66,7 +67,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); /* diff -puN drivers/char/watchdog/wafer5823wdt.c~watchdog-module-param-fixes drivers/char/watchdog/wafer5823wdt.c --- 25/drivers/char/watchdog/wafer5823wdt.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/wafer5823wdt.c Wed Jul 30 15:37:12 2003 @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -63,7 +64,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); static void wafwdt_ping(void) diff -puN drivers/char/watchdog/wdt285.c~watchdog-module-param-fixes drivers/char/watchdog/wdt285.c --- 25/drivers/char/watchdog/wdt285.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/wdt285.c Wed Jul 30 15:37:12 2003 @@ -16,6 +16,7 @@ */ #include +#include #include #include #include @@ -222,7 +223,7 @@ MODULE_AUTHOR("Phil Blundell +#include #include #include #include @@ -44,9 +45,9 @@ static unsigned long timer_alive; static int testmode; static int expect_close = 0; -MODULE_PARM(timeout, "i"); +module_param(timeout, int, 0); MODULE_PARM_DESC(timeout,"Watchdog timeout in seconds (60..15300), default=60"); -MODULE_PARM(testmode, "i"); +module_param(testmode, int, 0); MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0"); #ifdef CONFIG_WATCHDOG_NOWAYOUT @@ -55,7 +56,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); diff -puN drivers/char/watchdog/wdt_pci.c~watchdog-module-param-fixes drivers/char/watchdog/wdt_pci.c --- 25/drivers/char/watchdog/wdt_pci.c~watchdog-module-param-fixes Wed Jul 30 15:37:12 2003 +++ 25-akpm/drivers/char/watchdog/wdt_pci.c Wed Jul 30 15:37:12 2003 @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -88,7 +89,7 @@ static int nowayout = 1; static int nowayout = 0; #endif -MODULE_PARM(nowayout,"i"); +module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); /* _