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, 10 insertions, 15 deletions

diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c
index bc820d16699a..17ec5b9dddd2 100644
--- a/drivers/watchdog/mixcomwd.c
+++ b/drivers/watchdog/mixcomwd.c
@@ -39,9 +39,10 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define VERSION "0.6"
 #define WATCHDOG_NAME "mixcomwd"
-#define PFX WATCHDOG_NAME ": "
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -156,15 +157,13 @@ static int mixcomwd_release(struct inode *inode, struct file *file)
 {
         if (expect_close == 42) {
                 if (mixcomwd_timer_alive) {
-                        printk(KERN_ERR PFX
-                                "release called while internal timer alive");
+                        pr_err("release called while internal timer alive\n");
                         return -EBUSY;
                 }
                 mixcomwd_timer_alive = 1;
                 mod_timer(&mixcomwd_timer, jiffies + 5 * HZ);
         } else
-                printk(KERN_CRIT PFX
-                    "WDT device closed unexpectedly.  WDT will not stop!\n");
+                pr_crit("WDT device closed unexpectedly.  WDT will not stop!\n");
 
         clear_bit(0, &mixcomwd_opened);
         expect_close = 0;
@@ -274,22 +273,19 @@ static int __init mixcomwd_init(void)
         }
 
         if (!found) {
-                printk(KERN_ERR PFX
-                        "No card detected, or port not available.\n");
+                pr_err("No card detected, or port not available\n");
                 return -ENODEV;
         }
 
         ret = misc_register(&mixcomwd_miscdev);
         if (ret) {
-                printk(KERN_ERR PFX
-                        "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 error_misc_register_watchdog;
         }
 
-        printk(KERN_INFO
-                "MixCOM watchdog driver v%s, watchdog port at 0x%3x\n",
-                                        VERSION, watchdog_port);
+        pr_info("MixCOM watchdog driver v%s, watchdog port at 0x%3x\n",
+                VERSION, watchdog_port);
 
         return 0;
 
@@ -303,8 +299,7 @@ static void __exit mixcomwd_exit(void)
 {
         if (!nowayout) {
                 if (mixcomwd_timer_alive) {
-                        printk(KERN_WARNING PFX "I quit now, hardware will"
-                               " probably reboot!\n");
+                        pr_warn("I quit now, hardware will probably reboot!\n");
                         del_timer_sync(&mixcomwd_timer);
                         mixcomwd_timer_alive = 0;
                 }