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

diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 20feb4d3d791..3e335fa0f17d 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -17,6 +17,8 @@
  * option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -96,7 +98,7 @@ static void mpc8xxx_wdt_timer_ping(unsigned long arg)
 
 static void mpc8xxx_wdt_pr_warn(const char *msg)
 {
-        pr_crit("mpc8xxx_wdt: %s, expect the %s soon!\n", msg,
+        pr_crit("%s, expect the %s soon!\n", msg,
                 reset ? "reset" : "machine check exception");
 }
 
@@ -209,7 +211,7 @@ static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev)
 
         enabled = in_be32(&wd_base->swcrr) & SWCRR_SWEN;
         if (!enabled && wdt_type->hw_enabled) {
-                pr_info("mpc8xxx_wdt: could not be enabled in software\n");
+                pr_info("could not be enabled in software\n");
                 ret = -ENOSYS;
                 goto err_unmap;
         }
@@ -226,9 +228,8 @@ static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev)
                 goto err_unmap;
 #endif
 
-        pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d "
-                "(%d seconds)\n", reset ? "reset" : "interrupt", timeout,
-                timeout_sec);
+        pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d (%d seconds)\n",
+                reset ? "reset" : "interrupt", timeout, timeout_sec);
 
         /*
          * If the watchdog was previously enabled or we're running on
@@ -303,7 +304,7 @@ static int mpc8xxx_wdt_init_late(void)
         ret = misc_register(&mpc8xxx_wdt_miscdev);
         if (ret) {
                 pr_err("cannot register miscdev on minor=%d (err=%d)\n",
-                        WATCHDOG_MINOR, ret);
+                       WATCHDOG_MINOR, ret);
                 return ret;
         }
         return 0;