aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-06-04 14:35:41 -0400
committerWim Van Sebroeck <wim@iguana.be>2007-06-04 14:39:26 -0400
commit1c067318a2357fffc04e082429f276a8f4075561 (patch)
treeb563bc3d1d5d3a6843820a81187e3e4f741c7d9d
parent21baf3c7c7fcef5004671f697789aea84854ca45 (diff)
[WATCHDOG] Mixcom Watchdog - clean-up printk's
Clean-up printk's. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/char/watchdog/mixcomwd.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index 0836b9a941e2..e36c59c5d6c3 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -39,6 +39,8 @@
39 */ 39 */
40 40
41#define VERSION "0.6" 41#define VERSION "0.6"
42#define WATCHDOG_NAME "mixcomwd"
43#define PFX WATCHDOG_NAME ": "
42 44
43#include <linux/module.h> 45#include <linux/module.h>
44#include <linux/moduleparam.h> 46#include <linux/moduleparam.h>
@@ -152,13 +154,13 @@ static int mixcomwd_release(struct inode *inode, struct file *file)
152{ 154{
153 if (expect_close == 42) { 155 if (expect_close == 42) {
154 if(mixcomwd_timer_alive) { 156 if(mixcomwd_timer_alive) {
155 printk(KERN_ERR "mixcomwd: release called while internal timer alive"); 157 printk(KERN_ERR PFX "release called while internal timer alive");
156 return -EBUSY; 158 return -EBUSY;
157 } 159 }
158 mixcomwd_timer_alive=1; 160 mixcomwd_timer_alive=1;
159 mod_timer(&mixcomwd_timer, jiffies + 5 * HZ); 161 mod_timer(&mixcomwd_timer, jiffies + 5 * HZ);
160 } else { 162 } else {
161 printk(KERN_CRIT "mixcomwd: WDT device closed unexpectedly. WDT will not stop!\n"); 163 printk(KERN_CRIT PFX "WDT device closed unexpectedly. WDT will not stop!\n");
162 } 164 }
163 165
164 clear_bit(0,&mixcomwd_opened); 166 clear_bit(0,&mixcomwd_opened);
@@ -278,7 +280,7 @@ static int __init mixcomwd_init(void)
278 } 280 }
279 281
280 if (!found) { 282 if (!found) {
281 printk("mixcomwd: No card detected, or port not available.\n"); 283 printk(KERN_ERR PFX "No card detected, or port not available.\n");
282 return -ENODEV; 284 return -ENODEV;
283 } 285 }
284 286
@@ -298,7 +300,7 @@ static void __exit mixcomwd_exit(void)
298{ 300{
299 if (!nowayout) { 301 if (!nowayout) {
300 if(mixcomwd_timer_alive) { 302 if(mixcomwd_timer_alive) {
301 printk(KERN_WARNING "mixcomwd: I quit now, hardware will" 303 printk(KERN_WARNING PFX "I quit now, hardware will"
302 " probably reboot!\n"); 304 " probably reboot!\n");
303 del_timer_sync(&mixcomwd_timer); 305 del_timer_sync(&mixcomwd_timer);
304 mixcomwd_timer_alive=0; 306 mixcomwd_timer_alive=0;
@@ -313,5 +315,6 @@ module_exit(mixcomwd_exit);
313 315
314MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>"); 316MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>");
315MODULE_DESCRIPTION("MixCom Watchdog driver"); 317MODULE_DESCRIPTION("MixCom Watchdog driver");
318MODULE_VERSION(VERSION);
316MODULE_LICENSE("GPL"); 319MODULE_LICENSE("GPL");
317MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 320MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);