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/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 4ad78f86851..25c954d2ffa 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -10,6 +10,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>
@@ -209,8 +211,7 @@ static int orion_wdt_release(struct inode *inode, struct file *file)
         if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))
                 orion_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);
 
@@ -241,7 +242,7 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev)
         if (pdata) {
                 wdt_tclk = pdata->tclk;
         } else {
-                printk(KERN_ERR "Orion Watchdog misses platform data\n");
+                pr_err("misses platform data\n");
                 return -ENODEV;
         }
 
@@ -257,8 +258,8 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        printk(KERN_INFO "Orion Watchdog Timer: Initial timeout %d sec%s\n",
-                                heartbeat, nowayout ? ", nowayout" : "");
+        pr_info("Initial timeout %d sec%s\n",
+                heartbeat, nowayout ? ", nowayout" : "");
         return 0;
 }