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/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index 97f8a48d8b78..ee0f828bb34f 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -15,6 +15,8 @@
  * or implied.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -100,7 +102,7 @@ static void mv64x60_wdt_handler_enable(void)
         if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_FALSE,
                                    MV64x60_WDC_ENABLE_SHIFT)) {
                 mv64x60_wdt_service();
-                printk(KERN_NOTICE "mv64x60_wdt: watchdog activated\n");
+                pr_notice("watchdog activated\n");
         }
 }
 
@@ -108,7 +110,7 @@ static void mv64x60_wdt_handler_disable(void)
 {
         if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_TRUE,
                                    MV64x60_WDC_ENABLE_SHIFT))
-                printk(KERN_NOTICE "mv64x60_wdt: watchdog deactivated\n");
+                pr_notice("watchdog deactivated\n");
 }
 
 static void mv64x60_wdt_set_timeout(unsigned int timeout)
@@ -139,8 +141,7 @@ static int mv64x60_wdt_release(struct inode *inode, struct file *file)
         if (expect_close == 42)
                 mv64x60_wdt_handler_disable();
         else {
-                printk(KERN_CRIT
-                       "mv64x60_wdt: unexpected close, not stopping timer!\n");
+                pr_crit("unexpected close, not stopping timer!\n");
                 mv64x60_wdt_service();
         }
         expect_close = 0;
@@ -308,7 +309,7 @@ static struct platform_driver mv64x60_wdt_driver = {
 
 static int __init mv64x60_wdt_init(void)
 {
-        printk(KERN_INFO "MV64x60 watchdog driver\n");
+        pr_info("MV64x60 watchdog driver\n");
 
         return platform_driver_register(&mv64x60_wdt_driver);
 }