diff options
Diffstat (limited to 'drivers/watchdog/cpu5wdt.c')
| -rw-r--r-- | drivers/watchdog/cpu5wdt.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c index 7e888393de1..6d03e8e30f8 100644 --- a/drivers/watchdog/cpu5wdt.c +++ b/drivers/watchdog/cpu5wdt.c @@ -27,7 +27,6 @@ #include <linux/errno.h> #include <linux/miscdevice.h> #include <linux/fs.h> -#include <linux/init.h> #include <linux/ioport.h> #include <linux/timer.h> #include <linux/completion.h> @@ -215,7 +214,7 @@ static struct miscdevice cpu5wdt_misc = { /* init/exit function */ -static int __devinit cpu5wdt_init(void) +static int cpu5wdt_init(void) { unsigned int val; int err; @@ -256,16 +255,17 @@ no_port: return err; } -static int __devinit cpu5wdt_init_module(void) +static int cpu5wdt_init_module(void) { return cpu5wdt_init(); } -static void __devexit cpu5wdt_exit(void) +static void cpu5wdt_exit(void) { if (cpu5wdt_device.queue) { cpu5wdt_device.queue = 0; wait_for_completion(&cpu5wdt_device.stop); + del_timer(&cpu5wdt_device.timer); } misc_deregister(&cpu5wdt_misc); @@ -274,7 +274,7 @@ static void __devexit cpu5wdt_exit(void) } -static void __devexit cpu5wdt_exit_module(void) +static void cpu5wdt_exit_module(void) { cpu5wdt_exit(); } @@ -288,7 +288,6 @@ MODULE_AUTHOR("Heiko Ronsdorf <hero@ihg.uni-duisburg.de>"); MODULE_DESCRIPTION("sma cpu5 watchdog driver"); MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog"); MODULE_LICENSE("GPL"); -MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); module_param(port, int, 0); MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91"); |