watchdog: Use pr_<fmt> and pr_<level>

Use the current logging styles.

Make sure all output has a prefix.
Add missing newlines.
Remove now unnecessary PFX, NAME, and miscellaneous other #defines.
Coalesce formats.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

1 files changed, 14 insertions, 20 deletions

diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 6e6743d1066..d301b1bf166 100644
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -15,6 +15,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -33,8 +35,6 @@
 
 #define WATCHDOG_VERSION  "1.00"
 #define WATCHDOG_NAME     "W83977F WDT"
-#define PFX WATCHDOG_NAME ": "
-#define DRIVER_VERSION    WATCHDOG_NAME " driver, v" WATCHDOG_VERSION "\n"
 
 #define IO_INDEX_PORT     0x3F0
 #define IO_DATA_PORT      (IO_INDEX_PORT+1)
@@ -131,7 +131,7 @@ static int wdt_start(void)
 
         spin_unlock_irqrestore(&spinlock, flags);
 
-        printk(KERN_INFO PFX "activated.\n");
+        pr_info("activated\n");
 
         return 0;
 }
@@ -185,7 +185,7 @@ static int wdt_stop(void)
 
         spin_unlock_irqrestore(&spinlock, flags);
 
-        printk(KERN_INFO PFX "shutdown.\n");
+        pr_info("shutdown\n");
 
         return 0;
 }
@@ -313,8 +313,7 @@ static int wdt_release(struct inode *inode, struct file *file)
                 clear_bit(0, &timer_alive);
         } else {
                 wdt_keepalive();
-                printk(KERN_CRIT PFX
-                        "unexpected close, not stopping watchdog!\n");
+                pr_crit("unexpected close, not stopping watchdog!\n");
         }
         expect_close = 0;
         return 0;
@@ -471,7 +470,7 @@ static int __init w83977f_wdt_init(void)
 {
         int rc;
 
-        printk(KERN_INFO PFX DRIVER_VERSION);
+        pr_info("driver v%s\n", WATCHDOG_VERSION);
 
         /*
          * Check that the timeout value is within it's range;
@@ -479,36 +478,31 @@ static int __init w83977f_wdt_init(void)
          */
         if (wdt_set_timeout(timeout)) {
                 wdt_set_timeout(DEFAULT_TIMEOUT);
-                printk(KERN_INFO PFX
-                    "timeout value must be 15 <= timeout <= 7635, using %d\n",
-                                                        DEFAULT_TIMEOUT);
+                pr_info("timeout value must be 15 <= timeout <= 7635, using %d\n",
+                        DEFAULT_TIMEOUT);
         }
 
         if (!request_region(IO_INDEX_PORT, 2, WATCHDOG_NAME)) {
-                printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                        IO_INDEX_PORT);
+                pr_err("I/O address 0x%04x already in use\n", IO_INDEX_PORT);
                 rc = -EIO;
                 goto err_out;
         }
 
         rc = register_reboot_notifier(&wdt_notifier);
         if (rc) {
-                printk(KERN_ERR PFX
-                        "cannot register reboot notifier (err=%d)\n", rc);
+                pr_err("cannot register reboot notifier (err=%d)\n", rc);
                 goto err_out_region;
         }
 
         rc = misc_register(&wdt_miscdev);
         if (rc) {
-                printk(KERN_ERR PFX
-                        "cannot register miscdev on minor=%d (err=%d)\n",
-                                                wdt_miscdev.minor, rc);
+                pr_err("cannot register miscdev on minor=%d (err=%d)\n",
+                       wdt_miscdev.minor, rc);
                 goto err_out_reboot;
         }
 
-        printk(KERN_INFO PFX
-                "initialized. timeout=%d sec (nowayout=%d testmode=%d)\n",
-                                        timeout, nowayout, testmode);
+        pr_info("initialized. timeout=%d sec (nowayout=%d testmode=%d)\n",
+                timeout, nowayout, testmode);
 
         return 0;