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

diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
index 4d43286074aa..88e6c8ba4176 100644
--- a/drivers/watchdog/m54xx_wdt.c
+++ b/drivers/watchdog/m54xx_wdt.c
@@ -16,6 +16,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>
@@ -166,8 +168,7 @@ static int m54xx_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");
                 wdt_keepalive();
         }
         clear_bit(WDT_IN_USE, &wdt_status);
@@ -196,11 +197,10 @@ static int __init m54xx_wdt_init(void)
 {
         if (!request_mem_region(MCF_MBAR + MCF_GPT_GCIR0, 4,
                                                 "Coldfire M54xx Watchdog")) {
-                printk(KERN_WARNING
-                                "Coldfire M54xx Watchdog : I/O region busy\n");
+                pr_warn("I/O region busy\n");
                 return -EBUSY;
         }
-        printk(KERN_INFO "ColdFire watchdog driver is loaded.\n");
+        pr_info("driver is loaded\n");
 
         return misc_register(&m54xx_wdt_miscdev);
 }