diff options
Diffstat (limited to 'drivers/watchdog/m54xx_wdt.c')
-rw-r--r-- | drivers/watchdog/m54xx_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c index 4d43286074aa..88e6c8ba4176 100644 --- a/drivers/watchdog/m54xx_wdt.c +++ b/drivers/watchdog/m54xx_wdt.c | |||
@@ -16,6 +16,8 @@ | |||
16 | * warranty of any kind, whether express or implied. | 16 | * warranty of any kind, whether express or implied. |
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> |
@@ -166,8 +168,7 @@ static int m54xx_wdt_release(struct inode *inode, struct file *file) | |||
166 | if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) | 168 | if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) |
167 | wdt_disable(); | 169 | wdt_disable(); |
168 | else { | 170 | else { |
169 | printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - " | 171 | pr_crit("Device closed unexpectedly - timer will not stop\n"); |
170 | "timer will not stop\n"); | ||
171 | wdt_keepalive(); | 172 | wdt_keepalive(); |
172 | } | 173 | } |
173 | clear_bit(WDT_IN_USE, &wdt_status); | 174 | clear_bit(WDT_IN_USE, &wdt_status); |
@@ -196,11 +197,10 @@ static int __init m54xx_wdt_init(void) | |||
196 | { | 197 | { |
197 | if (!request_mem_region(MCF_MBAR + MCF_GPT_GCIR0, 4, | 198 | if (!request_mem_region(MCF_MBAR + MCF_GPT_GCIR0, 4, |
198 | "Coldfire M54xx Watchdog")) { | 199 | "Coldfire M54xx Watchdog")) { |
199 | printk(KERN_WARNING | 200 | pr_warn("I/O region busy\n"); |
200 | "Coldfire M54xx Watchdog : I/O region busy\n"); | ||
201 | return -EBUSY; | 201 | return -EBUSY; |
202 | } | 202 | } |
203 | printk(KERN_INFO "ColdFire watchdog driver is loaded.\n"); | 203 | pr_info("driver is loaded\n"); |
204 | 204 | ||
205 | return misc_register(&m54xx_wdt_miscdev); | 205 | return misc_register(&m54xx_wdt_miscdev); |
206 | } | 206 | } |