diff options
Diffstat (limited to 'drivers/watchdog/bcm47xx_wdt.c')
-rw-r--r-- | drivers/watchdog/bcm47xx_wdt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c index 5c5f4b14fd05..1989e179db17 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c | |||
@@ -10,6 +10,8 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
14 | |||
13 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
14 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
15 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
@@ -91,7 +93,7 @@ static void bcm47xx_timer_tick(unsigned long unused) | |||
91 | bcm47xx_wdt_hw_start(); | 93 | bcm47xx_wdt_hw_start(); |
92 | mod_timer(&wdt_timer, jiffies + HZ); | 94 | mod_timer(&wdt_timer, jiffies + HZ); |
93 | } else { | 95 | } else { |
94 | printk(KERN_CRIT DRV_NAME "Watchdog will fire soon!!!\n"); | 96 | pr_crit("Watchdog will fire soon!!!\n"); |
95 | } | 97 | } |
96 | } | 98 | } |
97 | 99 | ||
@@ -140,8 +142,7 @@ static int bcm47xx_wdt_release(struct inode *inode, struct file *file) | |||
140 | if (expect_release == 42) { | 142 | if (expect_release == 42) { |
141 | bcm47xx_wdt_stop(); | 143 | bcm47xx_wdt_stop(); |
142 | } else { | 144 | } else { |
143 | printk(KERN_CRIT DRV_NAME | 145 | pr_crit("Unexpected close, not stopping watchdog!\n"); |
144 | ": Unexpected close, not stopping watchdog!\n"); | ||
145 | bcm47xx_wdt_start(); | 146 | bcm47xx_wdt_start(); |
146 | } | 147 | } |
147 | 148 | ||
@@ -270,8 +271,7 @@ static int __init bcm47xx_wdt_init(void) | |||
270 | 271 | ||
271 | if (bcm47xx_wdt_settimeout(wdt_time)) { | 272 | if (bcm47xx_wdt_settimeout(wdt_time)) { |
272 | bcm47xx_wdt_settimeout(WDT_DEFAULT_TIME); | 273 | bcm47xx_wdt_settimeout(WDT_DEFAULT_TIME); |
273 | printk(KERN_INFO DRV_NAME ": " | 274 | pr_info("wdt_time value must be 0 < wdt_time < %d, using %d\n", |
274 | "wdt_time value must be 0 < wdt_time < %d, using %d\n", | ||
275 | (WDT_MAX_TIME + 1), wdt_time); | 275 | (WDT_MAX_TIME + 1), wdt_time); |
276 | } | 276 | } |
277 | 277 | ||
@@ -285,8 +285,8 @@ static int __init bcm47xx_wdt_init(void) | |||
285 | return ret; | 285 | return ret; |
286 | } | 286 | } |
287 | 287 | ||
288 | printk(KERN_INFO "BCM47xx Watchdog Timer enabled (%d seconds%s)\n", | 288 | pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n", |
289 | wdt_time, nowayout ? ", nowayout" : ""); | 289 | wdt_time, nowayout ? ", nowayout" : ""); |
290 | return 0; | 290 | return 0; |
291 | } | 291 | } |
292 | 292 | ||