Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...

[linux-flexiantxendom0-3.2.10.git] / drivers / watchdog / wdt285.c

diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 658a36d..5eec740 100644 (file)
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -16,6 +16,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -50,7 +52,7 @@ static unsigned long timer_alive;
  */
 static void watchdog_fire(int irq, void *dev_id)
 {
-       printk(KERN_CRIT "Watchdog: Would Reboot.\n");
+       pr_crit("Would Reboot\n");
        *CSR_TIMER4_CNTL = 0;
        *CSR_TIMER4_CLR = 0;
 }
@@ -206,13 +208,11 @@ static int __init footbridge_watchdog_init(void)
        if (retval < 0)
                return retval;
 
-       printk(KERN_INFO
-               "Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n",
-                                                               soft_margin);
+       pr_info("Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n",
+               soft_margin);
 
        if (machine_is_cats())
-               printk(KERN_WARNING
-                 "Warning: Watchdog reset may not work on this machine.\n");
+               pr_warn("Warning: Watchdog reset may not work on this machine\n");
        return 0;
 }