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, 12 insertions, 18 deletions

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 4d40965d2c9f..986258a06676 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -28,6 +28,8 @@
  *          add wdt_start and wdt_stop as parameters.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -43,7 +45,6 @@
 #include <asm/system.h>
 
 #define DRV_NAME "advantechwdt"
-#define PFX DRV_NAME ": "
 #define WATCHDOG_NAME "Advantech WDT"
 #define WATCHDOG_TIMEOUT 60             /* 60 sec default timeout */
 
@@ -207,8 +208,7 @@ static int advwdt_close(struct inode *inode, struct file *file)
         if (adv_expect_close == 42) {
                 advwdt_disable();
         } else {
-                printk(KERN_CRIT PFX
-                                "Unexpected close, not stopping watchdog!\n");
+                pr_crit("Unexpected close, not stopping watchdog!\n");
                 advwdt_ping();
         }
         clear_bit(0, &advwdt_is_open);
@@ -245,18 +245,15 @@ static int __devinit advwdt_probe(struct platform_device *dev)
 
         if (wdt_stop != wdt_start) {
                 if (!request_region(wdt_stop, 1, WATCHDOG_NAME)) {
-                        printk(KERN_ERR PFX
-                                "I/O address 0x%04x already in use\n",
-                                                                wdt_stop);
+                        pr_err("I/O address 0x%04x already in use\n",
+                               wdt_stop);
                         ret = -EIO;
                         goto out;
                 }
         }
 
         if (!request_region(wdt_start, 1, WATCHDOG_NAME)) {
-                printk(KERN_ERR PFX
-                                "I/O address 0x%04x already in use\n",
-                                                                wdt_start);
+                pr_err("I/O address 0x%04x already in use\n", wdt_start);
                 ret = -EIO;
                 goto unreg_stop;
         }
@@ -265,18 +262,16 @@ static int __devinit advwdt_probe(struct platform_device *dev)
          * if not reset to the default */
         if (advwdt_set_heartbeat(timeout)) {
                 advwdt_set_heartbeat(WATCHDOG_TIMEOUT);
-                printk(KERN_INFO PFX
-                        "timeout value must be 1<=x<=63, using %d\n", timeout);
+                pr_info("timeout value must be 1<=x<=63, using %d\n", timeout);
         }
 
         ret = misc_register(&advwdt_miscdev);
         if (ret != 0) {
-                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 unreg_regions;
         }
-        printk(KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
+        pr_info("initialized. timeout=%d sec (nowayout=%d)\n",
                 timeout, nowayout);
 out:
         return ret;
@@ -318,8 +313,7 @@ static int __init advwdt_init(void)
 {
         int err;
 
-        printk(KERN_INFO
-             "WDT driver for Advantech single board computer initialising.\n");
+        pr_info("WDT driver for Advantech single board computer initialising\n");
 
         err = platform_driver_register(&advwdt_driver);
         if (err)
@@ -343,7 +337,7 @@ static void __exit advwdt_exit(void)
 {
         platform_device_unregister(advwdt_platform_device);
         platform_driver_unregister(&advwdt_driver);
-        printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
+        pr_info("Watchdog Module Unloaded\n");
 }
 
 module_init(advwdt_init);