diff options
Diffstat (limited to 'drivers/watchdog/ixp4xx_wdt.c')
-rw-r--r-- | drivers/watchdog/ixp4xx_wdt.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index 4fc2e9ac26f7..792f95cfac85 100644 --- a/drivers/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c | |||
@@ -13,6 +13,8 @@ | |||
13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
17 | |||
16 | #include <linux/module.h> | 18 | #include <linux/module.h> |
17 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
18 | #include <linux/types.h> | 20 | #include <linux/types.h> |
@@ -147,8 +149,7 @@ static int ixp4xx_wdt_release(struct inode *inode, struct file *file) | |||
147 | if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) | 149 | if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) |
148 | wdt_disable(); | 150 | wdt_disable(); |
149 | else | 151 | else |
150 | printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - " | 152 | pr_crit("Device closed unexpectedly - timer will not stop\n"); |
151 | "timer will not stop\n"); | ||
152 | clear_bit(WDT_IN_USE, &wdt_status); | 153 | clear_bit(WDT_IN_USE, &wdt_status); |
153 | clear_bit(WDT_OK_TO_CLOSE, &wdt_status); | 154 | clear_bit(WDT_OK_TO_CLOSE, &wdt_status); |
154 | 155 | ||
@@ -176,8 +177,7 @@ static int __init ixp4xx_wdt_init(void) | |||
176 | int ret; | 177 | int ret; |
177 | 178 | ||
178 | if (!(read_cpuid_id() & 0xf) && !cpu_is_ixp46x()) { | 179 | if (!(read_cpuid_id() & 0xf) && !cpu_is_ixp46x()) { |
179 | printk(KERN_ERR "IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected" | 180 | pr_err("Rev. A0 IXP42x CPU detected - watchdog disabled\n"); |
180 | " - watchdog disabled\n"); | ||
181 | 181 | ||
182 | return -ENODEV; | 182 | return -ENODEV; |
183 | } | 183 | } |
@@ -185,8 +185,7 @@ static int __init ixp4xx_wdt_init(void) | |||
185 | WDIOF_CARDRESET : 0; | 185 | WDIOF_CARDRESET : 0; |
186 | ret = misc_register(&ixp4xx_wdt_miscdev); | 186 | ret = misc_register(&ixp4xx_wdt_miscdev); |
187 | if (ret == 0) | 187 | if (ret == 0) |
188 | printk(KERN_INFO "IXP4xx Watchdog Timer: heartbeat %d sec\n", | 188 | pr_info("timer heartbeat %d sec\n", heartbeat); |
189 | heartbeat); | ||
190 | return ret; | 189 | return ret; |
191 | } | 190 | } |
192 | 191 | ||