diff options
Diffstat (limited to 'drivers/watchdog/ep93xx_wdt.c')
-rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 726b7df61fd0..a6532b52c457 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * - Add a few missing ioctls | 23 | * - Add a few missing ioctls |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
27 | |||
26 | #include <linux/module.h> | 28 | #include <linux/module.h> |
27 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
28 | #include <linux/miscdevice.h> | 30 | #include <linux/miscdevice.h> |
@@ -33,7 +35,6 @@ | |||
33 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
34 | 36 | ||
35 | #define WDT_VERSION "0.3" | 37 | #define WDT_VERSION "0.3" |
36 | #define PFX "ep93xx_wdt: " | ||
37 | 38 | ||
38 | /* default timeout (secs) */ | 39 | /* default timeout (secs) */ |
39 | #define WDT_TIMEOUT 30 | 40 | #define WDT_TIMEOUT 30 |
@@ -173,8 +174,7 @@ static int ep93xx_wdt_release(struct inode *inode, struct file *file) | |||
173 | if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) | 174 | if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) |
174 | wdt_shutdown(); | 175 | wdt_shutdown(); |
175 | else | 176 | else |
176 | printk(KERN_CRIT PFX | 177 | pr_crit("Device closed unexpectedly - timer will not stop\n"); |
177 | "Device closed unexpectedly - timer will not stop\n"); | ||
178 | 178 | ||
179 | clear_bit(WDT_IN_USE, &wdt_status); | 179 | clear_bit(WDT_IN_USE, &wdt_status); |
180 | clear_bit(WDT_OK_TO_CLOSE, &wdt_status); | 180 | clear_bit(WDT_OK_TO_CLOSE, &wdt_status); |
@@ -214,15 +214,13 @@ static int __init ep93xx_wdt_init(void) | |||
214 | 214 | ||
215 | boot_status = __raw_readl(EP93XX_WDT_WATCHDOG) & 0x01 ? 1 : 0; | 215 | boot_status = __raw_readl(EP93XX_WDT_WATCHDOG) & 0x01 ? 1 : 0; |
216 | 216 | ||
217 | printk(KERN_INFO PFX "EP93XX watchdog, driver version " | 217 | pr_info("EP93XX watchdog, driver version " WDT_VERSION "%s\n", |
218 | WDT_VERSION "%s\n", | ||
219 | (__raw_readl(EP93XX_WDT_WATCHDOG) & 0x08) | 218 | (__raw_readl(EP93XX_WDT_WATCHDOG) & 0x08) |
220 | ? " (nCS1 disable detected)" : ""); | 219 | ? " (nCS1 disable detected)" : ""); |
221 | 220 | ||
222 | if (timeout < 1 || timeout > 3600) { | 221 | if (timeout < 1 || timeout > 3600) { |
223 | timeout = WDT_TIMEOUT; | 222 | timeout = WDT_TIMEOUT; |
224 | printk(KERN_INFO PFX | 223 | pr_info("timeout value must be 1<=x<=3600, using %d\n", |
225 | "timeout value must be 1<=x<=3600, using %d\n", | ||
226 | timeout); | 224 | timeout); |
227 | } | 225 | } |
228 | 226 | ||