diff options
Diffstat (limited to 'drivers/watchdog/booke_wdt.c')
-rw-r--r-- | drivers/watchdog/booke_wdt.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 7c0fdfca264..ce0ab4415ef 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -12,6 +12,8 @@ | |||
12 | * option) any later version. | 12 | * option) any later version. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
16 | |||
15 | #include <linux/module.h> | 17 | #include <linux/module.h> |
16 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
17 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
@@ -21,7 +23,6 @@ | |||
21 | #include <linux/uaccess.h> | 23 | #include <linux/uaccess.h> |
22 | 24 | ||
23 | #include <asm/reg_booke.h> | 25 | #include <asm/reg_booke.h> |
24 | #include <asm/system.h> | ||
25 | #include <asm/time.h> | 26 | #include <asm/time.h> |
26 | #include <asm/div64.h> | 27 | #include <asm/div64.h> |
27 | 28 | ||
@@ -225,8 +226,8 @@ static int booke_wdt_open(struct inode *inode, struct file *file) | |||
225 | if (booke_wdt_enabled == 0) { | 226 | if (booke_wdt_enabled == 0) { |
226 | booke_wdt_enabled = 1; | 227 | booke_wdt_enabled = 1; |
227 | on_each_cpu(__booke_wdt_enable, NULL, 0); | 228 | on_each_cpu(__booke_wdt_enable, NULL, 0); |
228 | pr_debug("booke_wdt: watchdog enabled (timeout = %llu sec)\n", | 229 | pr_debug("watchdog enabled (timeout = %llu sec)\n", |
229 | period_to_sec(booke_wdt_period)); | 230 | period_to_sec(booke_wdt_period)); |
230 | } | 231 | } |
231 | spin_unlock(&booke_wdt_lock); | 232 | spin_unlock(&booke_wdt_lock); |
232 | 233 | ||
@@ -243,7 +244,7 @@ static int booke_wdt_release(struct inode *inode, struct file *file) | |||
243 | */ | 244 | */ |
244 | on_each_cpu(__booke_wdt_disable, NULL, 0); | 245 | on_each_cpu(__booke_wdt_disable, NULL, 0); |
245 | booke_wdt_enabled = 0; | 246 | booke_wdt_enabled = 0; |
246 | pr_debug("booke_wdt: watchdog disabled\n"); | 247 | pr_debug("watchdog disabled\n"); |
247 | #endif | 248 | #endif |
248 | 249 | ||
249 | clear_bit(0, &wdt_is_active); | 250 | clear_bit(0, &wdt_is_active); |
@@ -275,19 +276,19 @@ static int __init booke_wdt_init(void) | |||
275 | { | 276 | { |
276 | int ret = 0; | 277 | int ret = 0; |
277 | 278 | ||
278 | pr_info("booke_wdt: powerpc book-e watchdog driver loaded\n"); | 279 | pr_info("powerpc book-e watchdog driver loaded\n"); |
279 | ident.firmware_version = cur_cpu_spec->pvr_value; | 280 | ident.firmware_version = cur_cpu_spec->pvr_value; |
280 | 281 | ||
281 | ret = misc_register(&booke_wdt_miscdev); | 282 | ret = misc_register(&booke_wdt_miscdev); |
282 | if (ret) { | 283 | if (ret) { |
283 | pr_err("booke_wdt: cannot register device (minor=%u, ret=%i)\n", | 284 | pr_err("cannot register device (minor=%u, ret=%i)\n", |
284 | WATCHDOG_MINOR, ret); | 285 | WATCHDOG_MINOR, ret); |
285 | return ret; | 286 | return ret; |
286 | } | 287 | } |
287 | 288 | ||
288 | spin_lock(&booke_wdt_lock); | 289 | spin_lock(&booke_wdt_lock); |
289 | if (booke_wdt_enabled == 1) { | 290 | if (booke_wdt_enabled == 1) { |
290 | pr_info("booke_wdt: watchdog enabled (timeout = %llu sec)\n", | 291 | pr_info("watchdog enabled (timeout = %llu sec)\n", |
291 | period_to_sec(booke_wdt_period)); | 292 | period_to_sec(booke_wdt_period)); |
292 | on_each_cpu(__booke_wdt_enable, NULL, 0); | 293 | on_each_cpu(__booke_wdt_enable, NULL, 0); |
293 | } | 294 | } |