diff options
Diffstat (limited to 'drivers/watchdog/wdt285.c')
-rw-r--r-- | drivers/watchdog/wdt285.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index f55135662d78..3daa330ae436 100644 --- a/drivers/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c | |||
@@ -16,6 +16,8 @@ | |||
16 | * | 16 | * |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
20 | |||
19 | #include <linux/module.h> | 21 | #include <linux/module.h> |
20 | #include <linux/moduleparam.h> | 22 | #include <linux/moduleparam.h> |
21 | #include <linux/types.h> | 23 | #include <linux/types.h> |
@@ -49,7 +51,7 @@ static unsigned long timer_alive; | |||
49 | */ | 51 | */ |
50 | static void watchdog_fire(int irq, void *dev_id) | 52 | static void watchdog_fire(int irq, void *dev_id) |
51 | { | 53 | { |
52 | printk(KERN_CRIT "Watchdog: Would Reboot.\n"); | 54 | pr_crit("Would Reboot\n"); |
53 | *CSR_TIMER4_CNTL = 0; | 55 | *CSR_TIMER4_CNTL = 0; |
54 | *CSR_TIMER4_CLR = 0; | 56 | *CSR_TIMER4_CLR = 0; |
55 | } | 57 | } |
@@ -205,13 +207,11 @@ static int __init footbridge_watchdog_init(void) | |||
205 | if (retval < 0) | 207 | if (retval < 0) |
206 | return retval; | 208 | return retval; |
207 | 209 | ||
208 | printk(KERN_INFO | 210 | pr_info("Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n", |
209 | "Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n", | 211 | soft_margin); |
210 | soft_margin); | ||
211 | 212 | ||
212 | if (machine_is_cats()) | 213 | if (machine_is_cats()) |
213 | printk(KERN_WARNING | 214 | pr_warn("Warning: Watchdog reset may not work on this machine\n"); |
214 | "Warning: Watchdog reset may not work on this machine.\n"); | ||
215 | return 0; | 215 | return 0; |
216 | } | 216 | } |
217 | 217 | ||