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

diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c
index 7c0d8630e641..c5a3ff957b8e 100644
--- a/drivers/watchdog/octeon-wdt-main.c
+++ b/drivers/watchdog/octeon-wdt-main.c
@@ -52,6 +52,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/miscdevice.h>
 #include <linux/interrupt.h>
 #include <linux/watchdog.h>
@@ -201,7 +203,7 @@ static void __init octeon_wdt_build_stage1(void)
         uasm_resolve_relocs(relocs, labels);
 
         len = (int)(p - nmi_stage1_insns);
-        pr_debug("Synthesized NMI stage 1 handler (%d instructions).\n", len);
+        pr_debug("Synthesized NMI stage 1 handler (%d instructions)\n", len);
 
         pr_debug("\t.set push\n");
         pr_debug("\t.set noreorder\n");
@@ -627,7 +629,7 @@ static int octeon_wdt_release(struct inode *inode, struct file *file)
                 do_coundown = 0;
                 octeon_wdt_ping();
         } else {
-                pr_crit("octeon_wdt: WDT device closed unexpectedly.  WDT will not stop!\n");
+                pr_crit("WDT device closed unexpectedly.  WDT will not stop!\n");
         }
         clear_bit(0, &octeon_wdt_is_open);
         expect_close = 0;
@@ -684,12 +686,12 @@ static int __init octeon_wdt_init(void)
 
         octeon_wdt_calc_parameters(heartbeat);
 
-        pr_info("octeon_wdt: Initial granularity %d Sec.\n", timeout_sec);
+        pr_info("Initial granularity %d Sec\n", timeout_sec);
 
         ret = misc_register(&octeon_wdt_miscdev);
         if (ret) {
-                pr_err("octeon_wdt: cannot register miscdev on minor=%d (err=%d)\n",
-                        WATCHDOG_MINOR, ret);
+                pr_err("cannot register miscdev on minor=%d (err=%d)\n",
+                       WATCHDOG_MINOR, ret);
                 goto out;
         }