watchdog: Use pr_<fmt> and pr_<level>

[deliverable/linux.git] / drivers / watchdog / ep93xx_wdt.c

diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 726b7df61fd08b366a728fb5be0c793235b4d585..a6532b52c457a0805fd7cc83890b1b3f119a54fd 100644 (file)
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -23,6 +23,8 @@
  *     - Add a few missing ioctls
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
@@ -33,7 +35,6 @@
 #include <mach/hardware.h>
 
 #define WDT_VERSION    "0.3"
-#define PFX            "ep93xx_wdt: "
 
 /* default timeout (secs) */
 #define WDT_TIMEOUT 30
@@ -173,8 +174,7 @@ static int ep93xx_wdt_release(struct inode *inode, struct file *file)
        if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))
                wdt_shutdown();
        else
-               printk(KERN_CRIT PFX
-                       "Device closed unexpectedly - timer will not stop\n");
+               pr_crit("Device closed unexpectedly - timer will not stop\n");
 
        clear_bit(WDT_IN_USE, &wdt_status);
        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
@@ -214,15 +214,13 @@ static int __init ep93xx_wdt_init(void)
 
        boot_status = __raw_readl(EP93XX_WDT_WATCHDOG) & 0x01 ? 1 : 0;
 
-       printk(KERN_INFO PFX "EP93XX watchdog, driver version "
-               WDT_VERSION "%s\n",
+       pr_info("EP93XX watchdog, driver version " WDT_VERSION "%s\n",
                (__raw_readl(EP93XX_WDT_WATCHDOG) & 0x08)
                ? " (nCS1 disable detected)" : "");
 
        if (timeout < 1 || timeout > 3600) {
                timeout = WDT_TIMEOUT;
-               printk(KERN_INFO PFX
-                       "timeout value must be 1<=x<=3600, using %d\n",
+               pr_info("timeout value must be 1<=x<=3600, using %d\n",
                        timeout);
        }