diff options
Diffstat (limited to 'drivers/watchdog/cpu5wdt.c')
| -rw-r--r-- | drivers/watchdog/cpu5wdt.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c index edd3475f41d..6d03e8e30f8 100644 --- a/drivers/watchdog/cpu5wdt.c +++ b/drivers/watchdog/cpu5wdt.c @@ -19,13 +19,14 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h> #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> @@ -39,7 +40,7 @@ static int verbose; static int port = 0x91; static int ticks = 10000; -static spinlock_t cpu5wdt_lock; +static DEFINE_SPINLOCK(cpu5wdt_lock); #define PFX "cpu5wdt: " @@ -71,7 +72,7 @@ static struct { static void cpu5wdt_trigger(unsigned long unused) { if (verbose > 2) - printk(KERN_DEBUG PFX "trigger at %i ticks\n", ticks); + pr_debug("trigger at %i ticks\n", ticks); if (cpu5wdt_device.running) ticks--; @@ -96,7 +97,7 @@ static void cpu5wdt_reset(void) ticks = cpu5wdt_device.default_ticks; if (verbose) - printk(KERN_DEBUG PFX "reset (%i ticks)\n", (int) ticks); + pr_debug("reset (%i ticks)\n", (int) ticks); } @@ -129,7 +130,7 @@ static int cpu5wdt_stop(void) ticks = cpu5wdt_device.default_ticks; spin_unlock_irqrestore(&cpu5wdt_lock, flags); if (verbose) - printk(KERN_CRIT PFX "stop not possible\n"); + pr_crit("stop not possible\n"); return -EIO; } @@ -213,23 +214,21 @@ static struct miscdevice cpu5wdt_misc = { /* init/exit function */ -static int __devinit cpu5wdt_init(void) +static int cpu5wdt_init(void) { unsigned int val; int err; if (verbose) - printk(KERN_DEBUG PFX - "port=0x%x, verbose=%i\n", port, verbose); + pr_debug("port=0x%x, verbose=%i\n", port, verbose); init_completion(&cpu5wdt_device.stop); - spin_lock_init(&cpu5wdt_lock); cpu5wdt_device.queue = 0; setup_timer(&cpu5wdt_device.timer, cpu5wdt_trigger, 0); cpu5wdt_device.default_ticks = ticks; if (!request_region(port, CPU5WDT_EXTENT, PFX)) { - printk(KERN_ERR PFX "request_region failed\n"); + pr_err("request_region failed\n"); err = -EBUSY; goto no_port; } @@ -238,16 +237,16 @@ static int __devinit cpu5wdt_init(void) val = inb(port + CPU5WDT_STATUS_REG); val = (val >> 2) & 1; if (!val) - printk(KERN_INFO PFX "sorry, was my fault\n"); + pr_info("sorry, was my fault\n"); err = misc_register(&cpu5wdt_misc); if (err < 0) { - printk(KERN_ERR PFX "misc_register failed\n"); + pr_err("misc_register failed\n"); goto no_misc; } - printk(KERN_INFO PFX "init success\n"); + pr_info("init success\n"); return 0; no_misc: @@ -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"); |