diff options
Diffstat (limited to 'drivers/watchdog/at91sam9_wdt.c')
-rw-r--r-- | drivers/watchdog/at91sam9_wdt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 00562566ef5f..cf39847bbad3 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c | |||
@@ -15,6 +15,8 @@ | |||
15 | * bootloader doesn't write to this register. | 15 | * bootloader doesn't write to this register. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
19 | |||
18 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
19 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
20 | #include <linux/init.h> | 22 | #include <linux/init.h> |
@@ -96,7 +98,7 @@ static void at91_ping(unsigned long data) | |||
96 | at91_wdt_reset(); | 98 | at91_wdt_reset(); |
97 | mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT); | 99 | mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT); |
98 | } else | 100 | } else |
99 | printk(KERN_CRIT DRV_NAME": I will reset your machine !\n"); | 101 | pr_crit("I will reset your machine !\n"); |
100 | } | 102 | } |
101 | 103 | ||
102 | /* | 104 | /* |
@@ -140,7 +142,7 @@ static int at91_wdt_settimeout(unsigned int timeout) | |||
140 | /* Check if disabled */ | 142 | /* Check if disabled */ |
141 | mr = wdt_read(AT91_WDT_MR); | 143 | mr = wdt_read(AT91_WDT_MR); |
142 | if (mr & AT91_WDT_WDDIS) { | 144 | if (mr & AT91_WDT_WDDIS) { |
143 | printk(KERN_ERR DRV_NAME": sorry, watchdog is disabled\n"); | 145 | pr_err("sorry, watchdog is disabled\n"); |
144 | return -EIO; | 146 | return -EIO; |
145 | } | 147 | } |
146 | 148 | ||
@@ -283,7 +285,7 @@ static int __init at91wdt_probe(struct platform_device *pdev) | |||
283 | setup_timer(&at91wdt_private.timer, at91_ping, 0); | 285 | setup_timer(&at91wdt_private.timer, at91_ping, 0); |
284 | mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT); | 286 | mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT); |
285 | 287 | ||
286 | printk(KERN_INFO DRV_NAME " enabled (heartbeat=%d sec, nowayout=%d)\n", | 288 | pr_info("enabled (heartbeat=%d sec, nowayout=%d)\n", |
287 | heartbeat, nowayout); | 289 | heartbeat, nowayout); |
288 | 290 | ||
289 | return 0; | 291 | return 0; |