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, 24 insertions, 29 deletions

diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index e78d89986768..a86f405b6325 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -18,6 +18,8 @@
  *      Release 1.1
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/miscdevice.h>
@@ -42,7 +44,6 @@
 
 #define VERSION             "1.1"
 #define MODNAME             "pc87413 WDT"
-#define PFX                 MODNAME ": "
 #define DPFX                MODNAME " - DEBUG: "
 
 #define WDT_INDEX_IO_PORT   (io+0)      /* I/O port base (index register) */
@@ -87,7 +88,7 @@ static inline void pc87413_select_wdt_out(void)
         outb_p(cr_data, WDT_DATA_IO_PORT);
 
 #ifdef DEBUG
-        printk(KERN_INFO DPFX
+        pr_info(DPFX
                 "Select multiple pin,pin55,as WDT output: Bit7 to 1: %d\n",
                                                                 cr_data);
 #endif
@@ -111,7 +112,7 @@ static inline void pc87413_enable_swc(void)
         outb_p(cr_data, WDT_DATA_IO_PORT);      /* Index0x30_bit0P1 */
 
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "pc87413 - Enable SWC functions\n");
+        pr_info(DPFX "pc87413 - Enable SWC functions\n");
 #endif
 }
 
@@ -132,7 +133,7 @@ static void pc87413_get_swc_base_addr(void)
 
         swc_base_addr = (addr_h << 8) + addr_l;
 #ifdef DEBUG
-        printk(KERN_INFO DPFX
+        pr_info(DPFX
                 "Read SWC I/O Base Address: low %d, high %d, res %d\n",
                                                 addr_l, addr_h, swc_base_addr);
 #endif
@@ -145,7 +146,7 @@ static inline void pc87413_swc_bank3(void)
         /* Step 4: Select Bank3 of SWC */
         outb_p(inb(swc_base_addr + 0x0f) | 0x03, swc_base_addr + 0x0f);
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "Select Bank3 of SWC\n");
+        pr_info(DPFX "Select Bank3 of SWC\n");
 #endif
 }
 
@@ -156,7 +157,7 @@ static inline void pc87413_programm_wdto(char pc87413_time)
         /* Step 5: Programm WDTO, Twd. */
         outb_p(pc87413_time, swc_base_addr + WDTO);
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "Set WDTO to %d minutes\n", pc87413_time);
+        pr_info(DPFX "Set WDTO to %d minutes\n", pc87413_time);
 #endif
 }
 
@@ -167,7 +168,7 @@ static inline void pc87413_enable_wden(void)
         /* Step 6: Enable WDEN */
         outb_p(inb(swc_base_addr + WDCTL) | 0x01, swc_base_addr + WDCTL);
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "Enable WDEN\n");
+        pr_info(DPFX "Enable WDEN\n");
 #endif
 }
 
@@ -177,7 +178,7 @@ static inline void pc87413_enable_sw_wd_tren(void)
         /* Enable SW_WD_TREN */
         outb_p(inb(swc_base_addr + WDCFG) | 0x80, swc_base_addr + WDCFG);
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "Enable SW_WD_TREN\n");
+        pr_info(DPFX "Enable SW_WD_TREN\n");
 #endif
 }
 
@@ -188,7 +189,7 @@ static inline void pc87413_disable_sw_wd_tren(void)
         /* Disable SW_WD_TREN */
         outb_p(inb(swc_base_addr + WDCFG) & 0x7f, swc_base_addr + WDCFG);
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "pc87413 - Disable SW_WD_TREN\n");
+        pr_info(DPFX "pc87413 - Disable SW_WD_TREN\n");
 #endif
 }
 
@@ -199,7 +200,7 @@ static inline void pc87413_enable_sw_wd_trg(void)
         /* Enable SW_WD_TRG */
         outb_p(inb(swc_base_addr + WDCTL) | 0x80, swc_base_addr + WDCTL);
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "pc87413 - Enable SW_WD_TRG\n");
+        pr_info(DPFX "pc87413 - Enable SW_WD_TRG\n");
 #endif
 }
 
@@ -210,7 +211,7 @@ static inline void pc87413_disable_sw_wd_trg(void)
         /* Disable SW_WD_TRG */
         outb_p(inb(swc_base_addr + WDCTL) & 0x7f, swc_base_addr + WDCTL);
 #ifdef DEBUG
-        printk(KERN_INFO DPFX "Disable SW_WD_TRG\n");
+        pr_info(DPFX "Disable SW_WD_TRG\n");
 #endif
 }
 
@@ -284,8 +285,7 @@ static int pc87413_open(struct inode *inode, struct file *file)
         /* Reload and activate timer */
         pc87413_refresh();
 
-        printk(KERN_INFO MODNAME
-                "Watchdog enabled. Timeout set to %d minute(s).\n", timeout);
+        pr_info("Watchdog enabled. Timeout set to %d minute(s).\n", timeout);
 
         return nonseekable_open(inode, file);
 }
@@ -308,11 +308,9 @@ static int pc87413_release(struct inode *inode, struct file *file)
 
         if (expect_close == 42) {
                 pc87413_disable();
-                printk(KERN_INFO MODNAME
-                                "Watchdog disabled, sleeping again...\n");
+                pr_info("Watchdog disabled, sleeping again...\n");
         } else {
-                printk(KERN_CRIT MODNAME
-                                "Unexpected close, not stopping watchdog!\n");
+                pr_crit("Unexpected close, not stopping watchdog!\n");
                 pc87413_refresh();
         }
         clear_bit(0, &timer_enabled);
@@ -428,7 +426,7 @@ static long pc87413_ioctl(struct file *file, unsigned int cmd,
         case WDIOC_KEEPALIVE:
                 pc87413_refresh();
 #ifdef DEBUG
-                printk(KERN_INFO DPFX "keepalive\n");
+                pr_info(DPFX "keepalive\n");
 #endif
                 return 0;
         case WDIOC_SETTIMEOUT:
@@ -508,7 +506,7 @@ static int __init pc87413_init(void)
 {
         int ret;
 
-        printk(KERN_INFO PFX "Version " VERSION " at io 0x%X\n",
+        pr_info("Version " VERSION " at io 0x%X\n",
                                                         WDT_INDEX_IO_PORT);
 
         if (!request_muxed_region(io, 2, MODNAME))
@@ -516,26 +514,23 @@ static int __init pc87413_init(void)
 
         ret = register_reboot_notifier(&pc87413_notifier);
         if (ret != 0) {
-                printk(KERN_ERR PFX
-                        "cannot register reboot notifier (err=%d)\n", ret);
+                pr_err("cannot register reboot notifier (err=%d)\n", ret);
         }
 
         ret = misc_register(&pc87413_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 reboot_unreg;
         }
-        printk(KERN_INFO PFX "initialized. timeout=%d min \n", timeout);
+        pr_info("initialized. timeout=%d min\n", timeout);
 
         pc87413_select_wdt_out();
         pc87413_enable_swc();
         pc87413_get_swc_base_addr();
 
         if (!request_region(swc_base_addr, 0x20, MODNAME)) {
-                printk(KERN_ERR PFX
-                        "cannot request SWC region at 0x%x\n", swc_base_addr);
+                pr_err("cannot request SWC region at 0x%x\n", swc_base_addr);
                 ret = -EBUSY;
                 goto misc_unreg;
         }
@@ -568,14 +563,14 @@ static void __exit pc87413_exit(void)
         /* Stop the timer before we leave */
         if (!nowayout) {
                 pc87413_disable();
-                printk(KERN_INFO MODNAME "Watchdog disabled.\n");
+                pr_info("Watchdog disabled\n");
         }
 
         misc_deregister(&pc87413_miscdev);
         unregister_reboot_notifier(&pc87413_notifier);
         release_region(swc_base_addr, 0x20);
 
-        printk(KERN_INFO MODNAME " watchdog component driver removed.\n");
+        pr_info("watchdog component driver removed\n");
 }
 
 module_init(pc87413_init);