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/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index 82fa7a92a8d2..add259b1887c 100644
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -24,6 +24,8 @@
  *      Dan Williams <dan.j.williams@intel.com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/fs.h>
@@ -85,7 +87,7 @@ static int wdt_disable(void)
                 write_wdtcr(IOP_WDTCR_DIS);
                 clear_bit(WDT_ENABLED, &wdt_status);
                 spin_unlock(&wdt_lock);
-                printk(KERN_INFO "WATCHDOG: Disabled\n");
+                pr_info("Disabled\n");
                 return 0;
         } else
                 return 1;
@@ -197,8 +199,8 @@ static int iop_wdt_release(struct inode *inode, struct file *file)
          */
         if (state != 0) {
                 wdt_enable();
-                printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - "
-                       "reset in %lu seconds\n", iop_watchdog_timeout());
+                pr_crit("Device closed unexpectedly - reset in %lu seconds\n",
+                        iop_watchdog_timeout());
         }
 
         clear_bit(WDT_IN_USE, &wdt_status);
@@ -238,8 +240,7 @@ static int __init iop_wdt_init(void)
            with an open */
         ret = misc_register(&iop_wdt_miscdev);
         if (ret == 0)
-                printk(KERN_INFO "iop watchdog timer: timeout %lu sec\n",
-                       iop_watchdog_timeout());
+                pr_info("timeout %lu sec\n", iop_watchdog_timeout());
 
         return ret;
 }