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

diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 7c0fdfca2646..3990d82f935c 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -12,6 +12,8 @@
  * option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/smp.h>
@@ -225,8 +227,8 @@ static int booke_wdt_open(struct inode *inode, struct file *file)
         if (booke_wdt_enabled == 0) {
                 booke_wdt_enabled = 1;
                 on_each_cpu(__booke_wdt_enable, NULL, 0);
-                pr_debug("booke_wdt: watchdog enabled (timeout = %llu sec)\n",
-                        period_to_sec(booke_wdt_period));
+                pr_debug("watchdog enabled (timeout = %llu sec)\n",
+                         period_to_sec(booke_wdt_period));
         }
         spin_unlock(&booke_wdt_lock);
 
@@ -243,7 +245,7 @@ static int booke_wdt_release(struct inode *inode, struct file *file)
          */
         on_each_cpu(__booke_wdt_disable, NULL, 0);
         booke_wdt_enabled = 0;
-        pr_debug("booke_wdt: watchdog disabled\n");
+        pr_debug("watchdog disabled\n");
 #endif
 
         clear_bit(0, &wdt_is_active);
@@ -275,19 +277,19 @@ static int __init booke_wdt_init(void)
 {
         int ret = 0;
 
-        pr_info("booke_wdt: powerpc book-e watchdog driver loaded\n");
+        pr_info("powerpc book-e watchdog driver loaded\n");
         ident.firmware_version = cur_cpu_spec->pvr_value;
 
         ret = misc_register(&booke_wdt_miscdev);
         if (ret) {
-                pr_err("booke_wdt: cannot register device (minor=%u, ret=%i)\n",
+                pr_err("cannot register device (minor=%u, ret=%i)\n",
                        WATCHDOG_MINOR, ret);
                 return ret;
         }
 
         spin_lock(&booke_wdt_lock);
         if (booke_wdt_enabled == 1) {
-                pr_info("booke_wdt: watchdog enabled (timeout = %llu sec)\n",
+                pr_info("watchdog enabled (timeout = %llu sec)\n",
                         period_to_sec(booke_wdt_period));
                 on_each_cpu(__booke_wdt_enable, NULL, 0);
         }