Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1c067318a2357fffc04e082429f276a8f4075561
Commit:     1c067318a2357fffc04e082429f276a8f4075561
Parent:     21baf3c7c7fcef5004671f697789aea84854ca45
Author:     Wim Van Sebroeck <[EMAIL PROTECTED]>
AuthorDate: Mon Jun 4 18:35:41 2007 +0000
Committer:  Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Mon Jun 4 18:39:26 2007 +0000

    [WATCHDOG] Mixcom Watchdog - clean-up printk's
    
    Clean-up printk's.
    
    Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
---
 drivers/char/watchdog/mixcomwd.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index 0836b9a..e36c59c 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -39,6 +39,8 @@
  */
 
 #define VERSION "0.6"
+#define WATCHDOG_NAME "mixcomwd"
+#define PFX WATCHDOG_NAME ": "
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -152,13 +154,13 @@ static int mixcomwd_release(struct inode *inode, struct 
file *file)
 {
        if (expect_close == 42) {
                if(mixcomwd_timer_alive) {
-                       printk(KERN_ERR "mixcomwd: release called while 
internal timer alive");
+                       printk(KERN_ERR PFX "release called while internal 
timer alive");
                        return -EBUSY;
                }
                mixcomwd_timer_alive=1;
                mod_timer(&mixcomwd_timer, jiffies + 5 * HZ);
        } else {
-               printk(KERN_CRIT "mixcomwd: WDT device closed unexpectedly.  
WDT will not stop!\n");
+               printk(KERN_CRIT PFX "WDT device closed unexpectedly.  WDT will 
not stop!\n");
        }
 
        clear_bit(0,&mixcomwd_opened);
@@ -278,7 +280,7 @@ static int __init mixcomwd_init(void)
        }
 
        if (!found) {
-               printk("mixcomwd: No card detected, or port not available.\n");
+               printk(KERN_ERR PFX "No card detected, or port not 
available.\n");
                return -ENODEV;
        }
 
@@ -298,7 +300,7 @@ static void __exit mixcomwd_exit(void)
 {
        if (!nowayout) {
                if(mixcomwd_timer_alive) {
-                       printk(KERN_WARNING "mixcomwd: I quit now, hardware 
will"
+                       printk(KERN_WARNING PFX "I quit now, hardware will"
                               " probably reboot!\n");
                        del_timer_sync(&mixcomwd_timer);
                        mixcomwd_timer_alive=0;
@@ -313,5 +315,6 @@ module_exit(mixcomwd_exit);
 
 MODULE_AUTHOR("Gergely Madarasz <[EMAIL PROTECTED]>");
 MODULE_DESCRIPTION("MixCom Watchdog driver");
+MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to