aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/orion_wdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog/orion_wdt.c')
-rw-r--r--drivers/watchdog/orion_wdt.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 4ad78f868515..25c954d2ffaa 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -10,6 +10,8 @@
10 * warranty of any kind, whether express or implied. 10 * warranty of any kind, whether express or implied.
11 */ 11 */
12 12
13#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
14
13#include <linux/module.h> 15#include <linux/module.h>
14#include <linux/moduleparam.h> 16#include <linux/moduleparam.h>
15#include <linux/types.h> 17#include <linux/types.h>
@@ -209,8 +211,7 @@ static int orion_wdt_release(struct inode *inode, struct file *file)
209 if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) 211 if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))
210 orion_wdt_disable(); 212 orion_wdt_disable();
211 else 213 else
212 printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - " 214 pr_crit("Device closed unexpectedly - timer will not stop\n");
213 "timer will not stop\n");
214 clear_bit(WDT_IN_USE, &wdt_status); 215 clear_bit(WDT_IN_USE, &wdt_status);
215 clear_bit(WDT_OK_TO_CLOSE, &wdt_status); 216 clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
216 217
@@ -241,7 +242,7 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev)
241 if (pdata) { 242 if (pdata) {
242 wdt_tclk = pdata->tclk; 243 wdt_tclk = pdata->tclk;
243 } else { 244 } else {
244 printk(KERN_ERR "Orion Watchdog misses platform data\n"); 245 pr_err("misses platform data\n");
245 return -ENODEV; 246 return -ENODEV;
246 } 247 }
247 248
@@ -257,8 +258,8 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev)
257 if (ret) 258 if (ret)
258 return ret; 259 return ret;
259 260
260 printk(KERN_INFO "Orion Watchdog Timer: Initial timeout %d sec%s\n", 261 pr_info("Initial timeout %d sec%s\n",
261 heartbeat, nowayout ? ", nowayout" : ""); 262 heartbeat, nowayout ? ", nowayout" : "");
262 return 0; 263 return 0;
263} 264}
264 265