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

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index b3046dc4b56c..3ecd246d2cfd 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -9,6 +9,8 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -209,8 +211,8 @@ static int __devinit at91wdt_probe(struct platform_device *pdev)
         if (res)
                 return res;
 
-        printk(KERN_INFO "AT91 Watchdog Timer enabled (%d seconds%s)\n",
-                                wdt_time, nowayout ? ", nowayout" : "");
+        pr_info("AT91 Watchdog Timer enabled (%d seconds%s)\n",
+                wdt_time, nowayout ? ", nowayout" : "");
         return 0;
 }
 
@@ -268,8 +270,8 @@ static int __init at91_wdt_init(void)
            if not reset to the default */
         if (at91_wdt_settimeout(wdt_time)) {
                 at91_wdt_settimeout(WDT_DEFAULT_TIME);
-                pr_info("at91_wdt: wdt_time value must be 1 <= wdt_time <= 256"
-                                                ", using %d\n", wdt_time);
+                pr_info("wdt_time value must be 1 <= wdt_time <= 256, using %d\n",
+                        wdt_time);
         }
 
         return platform_driver_register(&at91wdt_driver);