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

diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 4fc2e9ac26f7..792f95cfac85 100644
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -13,6 +13,8 @@
  * warranty of any kind, whether express or implied.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -147,8 +149,7 @@ static int ixp4xx_wdt_release(struct inode *inode, struct file *file)
         if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))
                 wdt_disable();
         else
-                printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - "
-                                        "timer will not stop\n");
+                pr_crit("Device closed unexpectedly - timer will not stop\n");
         clear_bit(WDT_IN_USE, &wdt_status);
         clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
 
@@ -176,8 +177,7 @@ static int __init ixp4xx_wdt_init(void)
         int ret;
 
         if (!(read_cpuid_id() & 0xf) && !cpu_is_ixp46x()) {
-                printk(KERN_ERR "IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected"
-                        " - watchdog disabled\n");
+                pr_err("Rev. A0 IXP42x CPU detected - watchdog disabled\n");
 
                 return -ENODEV;
         }
@@ -185,8 +185,7 @@ static int __init ixp4xx_wdt_init(void)
                         WDIOF_CARDRESET : 0;
         ret = misc_register(&ixp4xx_wdt_miscdev);
         if (ret == 0)
-                printk(KERN_INFO "IXP4xx Watchdog Timer: heartbeat %d sec\n",
-                        heartbeat);
+                pr_info("timer heartbeat %d sec\n", heartbeat);
         return ret;
 }