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

diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index 46f4b85b46de..e90f4ce32799 100644
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -19,6 +19,8 @@
  *                  -- Mike Waychison <michael.waychison@sun.com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -36,9 +38,6 @@
 
 #include <asm/system.h>
 
-#define OUR_NAME "alim7101_wdt"
-#define PFX OUR_NAME ": "
-
 #define WDT_ENABLE 0x9C
 #define WDT_DISABLE 0x8C
 
@@ -112,8 +111,7 @@ static void wdt_timer_ping(unsigned long data)
                                         ALI_7101_GPIO_O, tmp & ~0x20);
                 }
         } else {
-                printk(KERN_WARNING PFX
-                        "Heartbeat lost! Will not ping the watchdog\n");
+                pr_warn("Heartbeat lost! Will not ping the watchdog\n");
         }
         /* Re-set the timer interval */
         mod_timer(&timer, jiffies + WDT_INTERVAL);
@@ -162,7 +160,7 @@ static void wdt_startup(void)
         /* Start the timer */
         mod_timer(&timer, jiffies + WDT_INTERVAL);
 
-        printk(KERN_INFO PFX "Watchdog timer is now enabled.\n");
+        pr_info("Watchdog timer is now enabled\n");
 }
 
 static void wdt_turnoff(void)
@@ -170,7 +168,7 @@ static void wdt_turnoff(void)
         /* Stop the timer */
         del_timer_sync(&timer);
         wdt_change(WDT_DISABLE);
-        printk(KERN_INFO PFX "Watchdog timer is now disabled...\n");
+        pr_info("Watchdog timer is now disabled...\n");
 }
 
 static void wdt_keepalive(void)
@@ -226,8 +224,7 @@ static int fop_close(struct inode *inode, struct file *file)
                 wdt_turnoff();
         else {
                 /* wim: shouldn't there be a: del_timer(&timer); */
-                printk(KERN_CRIT PFX
-                  "device file closed unexpectedly. Will not stop the WDT!\n");
+                pr_crit("device file closed unexpectedly. Will not stop the WDT!\n");
         }
         clear_bit(0, &wdt_is_open);
         wdt_expect_close = 0;
@@ -322,8 +319,7 @@ static int wdt_notify_sys(struct notifier_block *this,
                  * watchdog on reboot with no heartbeat
                  */
                 wdt_change(WDT_ENABLE);
-                printk(KERN_INFO PFX "Watchdog timer is now enabled "
-                        "with no heartbeat - should reboot in ~1 second.\n");
+                pr_info("Watchdog timer is now enabled with no heartbeat - should reboot in ~1 second\n");
         }
         return NOTIFY_DONE;
 }
@@ -352,12 +348,11 @@ static int __init alim7101_wdt_init(void)
         struct pci_dev *ali1543_south;
         char tmp;
 
-        printk(KERN_INFO PFX "Steve Hill <steve@navaho.co.uk>.\n");
+        pr_info("Steve Hill <steve@navaho.co.uk>\n");
         alim7101_pmu = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
                 NULL);
         if (!alim7101_pmu) {
-                printk(KERN_INFO PFX
-                        "ALi M7101 PMU not present - WDT not set\n");
+                pr_info("ALi M7101 PMU not present - WDT not set\n");
                 return -EBUSY;
         }
 
@@ -367,56 +362,46 @@ static int __init alim7101_wdt_init(void)
         ali1543_south = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
                 NULL);
         if (!ali1543_south) {
-                printk(KERN_INFO PFX
-                        "ALi 1543 South-Bridge not present - WDT not set\n");
+                pr_info("ALi 1543 South-Bridge not present - WDT not set\n");
                 goto err_out;
         }
         pci_read_config_byte(ali1543_south, 0x5e, &tmp);
         pci_dev_put(ali1543_south);
         if ((tmp & 0x1e) == 0x00) {
                 if (!use_gpio) {
-                        printk(KERN_INFO PFX
-                                "Detected old alim7101 revision 'a1d'.  "
-                                "If this is a cobalt board, set the 'use_gpio' "
-                                "module parameter.\n");
+                        pr_info("Detected old alim7101 revision 'a1d'.  If this is a cobalt board, set the 'use_gpio' module parameter.\n");
                         goto err_out;
                 }
                 nowayout = 1;
         } else if ((tmp & 0x1e) != 0x12 && (tmp & 0x1e) != 0x00) {
-                printk(KERN_INFO PFX
-                        "ALi 1543 South-Bridge does not have the correct "
-                        "revision number (???1001?) - WDT not set\n");
+                pr_info("ALi 1543 South-Bridge does not have the correct revision number (???1001?) - WDT not set\n");
                 goto err_out;
         }
 
         if (timeout < 1 || timeout > 3600) {
                 /* arbitrary upper limit */
                 timeout = WATCHDOG_TIMEOUT;
-                printk(KERN_INFO PFX
-                        "timeout value must be 1 <= x <= 3600, using %d\n",
-                                                                timeout);
+                pr_info("timeout value must be 1 <= x <= 3600, using %d\n",
+                        timeout);
         }
 
         rc = register_reboot_notifier(&wdt_notifier);
         if (rc) {
-                printk(KERN_ERR PFX
-                        "cannot register reboot notifier (err=%d)\n", rc);
+                pr_err("cannot register reboot notifier (err=%d)\n", rc);
                 goto err_out;
         }
 
         rc = misc_register(&wdt_miscdev);
         if (rc) {
-                printk(KERN_ERR PFX
-                        "cannot register miscdev on minor=%d (err=%d)\n",
-                        wdt_miscdev.minor, rc);
+                pr_err("cannot register miscdev on minor=%d (err=%d)\n",
+                       wdt_miscdev.minor, rc);
                 goto err_out_reboot;
         }
 
         if (nowayout)
                 __module_get(THIS_MODULE);
 
-        printk(KERN_INFO PFX "WDT driver for ALi M7101 initialised. "
-                                        "timeout=%d sec (nowayout=%d)\n",
+        pr_info("WDT driver for ALi M7101 initialised. timeout=%d sec (nowayout=%d)\n",
                 timeout, nowayout);
         return 0;