Commit 1c067318a2357fffc04e082429f276a8f4075561
1 parent
21baf3c7c7
Exists in
master
and in
7 other branches
[WATCHDOG] Mixcom Watchdog - clean-up printk's
Clean-up printk's. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff
drivers/char/watchdog/mixcomwd.c
| ... | ... | @@ -39,6 +39,8 @@ |
| 39 | 39 | */ |
| 40 | 40 | |
| 41 | 41 | #define VERSION "0.6" |
| 42 | +#define WATCHDOG_NAME "mixcomwd" | |
| 43 | +#define PFX WATCHDOG_NAME ": " | |
| 42 | 44 | |
| 43 | 45 | #include <linux/module.h> |
| 44 | 46 | #include <linux/moduleparam.h> |
| 45 | 47 | |
| ... | ... | @@ -152,13 +154,13 @@ |
| 152 | 154 | { |
| 153 | 155 | if (expect_close == 42) { |
| 154 | 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 | 158 | return -EBUSY; |
| 157 | 159 | } |
| 158 | 160 | mixcomwd_timer_alive=1; |
| 159 | 161 | mod_timer(&mixcomwd_timer, jiffies + 5 * HZ); |
| 160 | 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 | 166 | clear_bit(0,&mixcomwd_opened); |
| ... | ... | @@ -278,7 +280,7 @@ |
| 278 | 280 | } |
| 279 | 281 | |
| 280 | 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 | 284 | return -ENODEV; |
| 283 | 285 | } |
| 284 | 286 | |
| ... | ... | @@ -298,7 +300,7 @@ |
| 298 | 300 | { |
| 299 | 301 | if (!nowayout) { |
| 300 | 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 | 304 | " probably reboot!\n"); |
| 303 | 305 | del_timer_sync(&mixcomwd_timer); |
| 304 | 306 | mixcomwd_timer_alive=0; |
| ... | ... | @@ -313,6 +315,7 @@ |
| 313 | 315 | |
| 314 | 316 | MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>"); |
| 315 | 317 | MODULE_DESCRIPTION("MixCom Watchdog driver"); |
| 318 | +MODULE_VERSION(VERSION); | |
| 316 | 319 | MODULE_LICENSE("GPL"); |
| 317 | 320 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |