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/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index b146082bd85a..d95203be37ad 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -24,6 +24,8 @@
  * capabilities) a kernel-based watchdog.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/compiler.h>
 #include <linux/init.h>
@@ -110,7 +112,7 @@ static void gef_wdt_handler_enable(void)
         if (gef_wdt_toggle_wdc(GEF_WDC_ENABLED_FALSE,
                                    GEF_WDC_ENABLE_SHIFT)) {
                 gef_wdt_service();
-                printk(KERN_NOTICE "gef_wdt: watchdog activated\n");
+                pr_notice("watchdog activated\n");
         }
 }
 
@@ -118,7 +120,7 @@ static void gef_wdt_handler_disable(void)
 {
         if (gef_wdt_toggle_wdc(GEF_WDC_ENABLED_TRUE,
                                    GEF_WDC_ENABLE_SHIFT))
-                printk(KERN_NOTICE "gef_wdt: watchdog deactivated\n");
+                pr_notice("watchdog deactivated\n");
 }
 
 static void gef_wdt_set_timeout(unsigned int timeout)
@@ -234,8 +236,7 @@ static int gef_wdt_release(struct inode *inode, struct file *file)
         if (expect_close == 42)
                 gef_wdt_handler_disable();
         else {
-                printk(KERN_CRIT
-                       "gef_wdt: unexpected close, not stopping timer!\n");
+                pr_crit("unexpected close, not stopping timer!\n");
                 gef_wdt_service();
         }
         expect_close = 0;
@@ -313,7 +314,7 @@ static struct platform_driver gef_wdt_driver = {
 
 static int __init gef_wdt_init(void)
 {
-        printk(KERN_INFO "GE watchdog driver\n");
+        pr_info("GE watchdog driver\n");
         return platform_driver_register(&gef_wdt_driver);
 }