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

diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 82ccd36e2c90..a7de5f6bf688 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -19,6 +19,9 @@
  *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -442,9 +445,6 @@ static struct platform_driver mpcore_wdt_driver = {
         },
 };
 
-static char banner[] __initdata = KERN_INFO "MPcore Watchdog Timer: 0.1. "
-                "mpcore_noboot=%d mpcore_margin=%d sec (nowayout= %d)\n";
-
 static int __init mpcore_wdt_init(void)
 {
         /*
@@ -453,11 +453,12 @@ static int __init mpcore_wdt_init(void)
          */
         if (mpcore_wdt_set_heartbeat(mpcore_margin)) {
                 mpcore_wdt_set_heartbeat(TIMER_MARGIN);
-                printk(KERN_INFO "mpcore_margin value must be 0 < mpcore_margin < 65536, using %d\n",
+                pr_info("mpcore_margin value must be 0 < mpcore_margin < 65536, using %d\n",
                         TIMER_MARGIN);
         }
 
-        printk(banner, mpcore_noboot, mpcore_margin, nowayout);
+        pr_info("MPcore Watchdog Timer: 0.1. mpcore_noboot=%d mpcore_margin=%d sec (nowayout= %d)\n",
+                mpcore_noboot, mpcore_margin, nowayout);
 
         return platform_driver_register(&mpcore_wdt_driver);
 }