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

diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index 5c5f4b14fd05..1989e179db17 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -10,6 +10,8 @@
  *  2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -91,7 +93,7 @@ static void bcm47xx_timer_tick(unsigned long unused)
                 bcm47xx_wdt_hw_start();
                 mod_timer(&wdt_timer, jiffies + HZ);
         } else {
-                printk(KERN_CRIT DRV_NAME "Watchdog will fire soon!!!\n");
+                pr_crit("Watchdog will fire soon!!!\n");
         }
 }
 
@@ -140,8 +142,7 @@ static int bcm47xx_wdt_release(struct inode *inode, struct file *file)
         if (expect_release == 42) {
                 bcm47xx_wdt_stop();
         } else {
-                printk(KERN_CRIT DRV_NAME
-                        ": Unexpected close, not stopping watchdog!\n");
+                pr_crit("Unexpected close, not stopping watchdog!\n");
                 bcm47xx_wdt_start();
         }
 
@@ -270,8 +271,7 @@ static int __init bcm47xx_wdt_init(void)
 
         if (bcm47xx_wdt_settimeout(wdt_time)) {
                 bcm47xx_wdt_settimeout(WDT_DEFAULT_TIME);
-                printk(KERN_INFO DRV_NAME ": "
-                        "wdt_time value must be 0 < wdt_time < %d, using %d\n",
+                pr_info("wdt_time value must be 0 < wdt_time < %d, using %d\n",
                         (WDT_MAX_TIME + 1), wdt_time);
         }
 
@@ -285,8 +285,8 @@ static int __init bcm47xx_wdt_init(void)
                 return ret;
         }
 
-        printk(KERN_INFO "BCM47xx Watchdog Timer enabled (%d seconds%s)\n",
-                                wdt_time, nowayout ? ", nowayout" : "");
+        pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n",
+                wdt_time, nowayout ? ", nowayout" : "");
         return 0;
 }