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, 22 deletions

diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
index 626d0e8e56c3..1d0c971d8857 100644
--- a/drivers/watchdog/sbc60xxwdt.c
+++ b/drivers/watchdog/sbc60xxwdt.c
@@ -48,6 +48,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -132,8 +134,7 @@ static void wdt_timer_ping(unsigned long data)
                 /* Re-set the timer interval */
                 mod_timer(&timer, jiffies + WDT_INTERVAL);
         } else
-                printk(KERN_WARNING PFX
-                        "Heartbeat lost! Will not ping the watchdog\n");
+                pr_warn("Heartbeat lost! Will not ping the watchdog\n");
 }
 
 /*
@@ -146,7 +147,7 @@ static void wdt_startup(void)
 
         /* Start the timer */
         mod_timer(&timer, jiffies + WDT_INTERVAL);
-        printk(KERN_INFO PFX "Watchdog timer is now enabled.\n");
+        pr_info("Watchdog timer is now enabled\n");
 }
 
 static void wdt_turnoff(void)
@@ -154,7 +155,7 @@ static void wdt_turnoff(void)
         /* Stop the timer */
         del_timer(&timer);
         inb_p(wdt_stop);
-        printk(KERN_INFO PFX "Watchdog timer is now disabled...\n");
+        pr_info("Watchdog timer is now disabled...\n");
 }
 
 static void wdt_keepalive(void)
@@ -217,8 +218,7 @@ static int fop_close(struct inode *inode, struct file *file)
                 wdt_turnoff();
         else {
                 del_timer(&timer);
-                printk(KERN_CRIT PFX
-                  "device file closed unexpectedly. Will not stop the WDT!\n");
+                pr_crit("device file closed unexpectedly. Will not stop the WDT!\n");
         }
         clear_bit(0, &wdt_is_open);
         wdt_expect_close = 0;
@@ -335,14 +335,12 @@ static int __init sbc60xxwdt_init(void)
 
         if (timeout < 1 || timeout > 3600) { /* arbitrary upper limit */
                 timeout = WATCHDOG_TIMEOUT;
-                printk(KERN_INFO PFX
-                        "timeout value must be 1 <= x <= 3600, using %d\n",
-                                                                timeout);
+                pr_info("timeout value must be 1 <= x <= 3600, using %d\n",
+                        timeout);
         }
 
         if (!request_region(wdt_start, 1, "SBC 60XX WDT")) {
-                printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                        wdt_start);
+                pr_err("I/O address 0x%04x already in use\n", wdt_start);
                 rc = -EIO;
                 goto err_out;
         }
@@ -350,9 +348,7 @@ static int __init sbc60xxwdt_init(void)
         /* We cannot reserve 0x45 - the kernel already has! */
         if (wdt_stop != 0x45 && wdt_stop != wdt_start) {
                 if (!request_region(wdt_stop, 1, "SBC 60XX WDT")) {
-                        printk(KERN_ERR PFX
-                                "I/O address 0x%04x already in use\n",
-                                                        wdt_stop);
+                        pr_err("I/O address 0x%04x already in use\n", wdt_stop);
                         rc = -EIO;
                         goto err_out_region1;
                 }
@@ -360,21 +356,18 @@ static int __init sbc60xxwdt_init(void)
 
         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_region2;
         }
 
         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
-                "WDT driver for 60XX single board computer initialised. "
-                "timeout=%d sec (nowayout=%d)\n", timeout, nowayout);
+        pr_info("WDT driver for 60XX single board computer initialised. timeout=%d sec (nowayout=%d)\n",
+                timeout, nowayout);
 
         return 0;