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, 15 insertions, 21 deletions

diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c
index a2f01c9f5c34..cfb0a8cd7f12 100644
--- a/drivers/watchdog/wdt977.c
+++ b/drivers/watchdog/wdt977.c
@@ -23,6 +23,8 @@
  *                                  Netwinders only
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -42,8 +44,6 @@
 
 #define WATCHDOG_VERSION  "0.04"
 #define WATCHDOG_NAME     "Wdt977"
-#define PFX WATCHDOG_NAME ": "
-#define DRIVER_VERSION    WATCHDOG_NAME " driver, v" WATCHDOG_VERSION "\n"
 
 #define IO_INDEX_PORT   0x370           /* on some systems it can be 0x3F0 */
 #define IO_DATA_PORT    (IO_INDEX_PORT + 1)
@@ -119,7 +119,7 @@ static int wdt977_start(void)
         outb_p(LOCK_DATA, IO_INDEX_PORT);
 
         spin_unlock_irqrestore(&spinlock, flags);
-        printk(KERN_INFO PFX "activated.\n");
+        pr_info("activated\n");
 
         return 0;
 }
@@ -164,7 +164,7 @@ static int wdt977_stop(void)
         outb_p(LOCK_DATA, IO_INDEX_PORT);
 
         spin_unlock_irqrestore(&spinlock, flags);
-        printk(KERN_INFO PFX "shutdown.\n");
+        pr_info("shutdown\n");
 
         return 0;
 }
@@ -288,8 +288,7 @@ static int wdt977_release(struct inode *inode, struct file *file)
                 clear_bit(0, &timer_alive);
         } else {
                 wdt977_keepalive();
-                printk(KERN_CRIT PFX
-                        "Unexpected close, not stopping watchdog!\n");
+                pr_crit("Unexpected close, not stopping watchdog!\n");
         }
         expect_close = 0;
         return 0;
@@ -446,15 +445,14 @@ static int __init wd977_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 its range;
            if not reset to the default */
         if (wdt977_set_timeout(timeout)) {
                 wdt977_set_timeout(DEFAULT_TIMEOUT);
-                printk(KERN_INFO PFX
-                      "timeout value must be 60 < timeout < 15300, using %d\n",
-                                                        DEFAULT_TIMEOUT);
+                pr_info("timeout value must be 60 < timeout < 15300, using %d\n",
+                        DEFAULT_TIMEOUT);
         }
 
         /* on Netwinder the IOports are already reserved by
@@ -462,9 +460,8 @@ static int __init wd977_init(void)
          */
         if (!machine_is_netwinder()) {
                 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;
                 }
@@ -472,22 +469,19 @@ static int __init wd977_init(void)
 
         rc = register_reboot_notifier(&wdt977_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(&wdt977_miscdev);
         if (rc) {
-                printk(KERN_ERR PFX
-                        "cannot register miscdev on minor=%d (err=%d)\n",
-                                                wdt977_miscdev.minor, rc);
+                pr_err("cannot register miscdev on minor=%d (err=%d)\n",
+                       wdt977_miscdev.minor, rc);
                 goto err_out_reboot;
         }
 
-        printk(KERN_INFO PFX
-                "initialized. timeout=%d sec (nowayout=%d, testmode=%i)\n",
-                                                timeout, nowayout, testmode);
+        pr_info("initialized. timeout=%d sec (nowayout=%d, testmode=%i)\n",
+                timeout, nowayout, testmode);
 
         return 0;