diff options
Diffstat (limited to 'drivers/watchdog/octeon-wdt-main.c')
-rw-r--r-- | drivers/watchdog/octeon-wdt-main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c index 7c0d8630e641..c5a3ff957b8e 100644 --- a/drivers/watchdog/octeon-wdt-main.c +++ b/drivers/watchdog/octeon-wdt-main.c | |||
@@ -52,6 +52,8 @@ | |||
52 | * | 52 | * |
53 | */ | 53 | */ |
54 | 54 | ||
55 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
56 | |||
55 | #include <linux/miscdevice.h> | 57 | #include <linux/miscdevice.h> |
56 | #include <linux/interrupt.h> | 58 | #include <linux/interrupt.h> |
57 | #include <linux/watchdog.h> | 59 | #include <linux/watchdog.h> |
@@ -201,7 +203,7 @@ static void __init octeon_wdt_build_stage1(void) | |||
201 | uasm_resolve_relocs(relocs, labels); | 203 | uasm_resolve_relocs(relocs, labels); |
202 | 204 | ||
203 | len = (int)(p - nmi_stage1_insns); | 205 | len = (int)(p - nmi_stage1_insns); |
204 | pr_debug("Synthesized NMI stage 1 handler (%d instructions).\n", len); | 206 | pr_debug("Synthesized NMI stage 1 handler (%d instructions)\n", len); |
205 | 207 | ||
206 | pr_debug("\t.set push\n"); | 208 | pr_debug("\t.set push\n"); |
207 | pr_debug("\t.set noreorder\n"); | 209 | pr_debug("\t.set noreorder\n"); |
@@ -627,7 +629,7 @@ static int octeon_wdt_release(struct inode *inode, struct file *file) | |||
627 | do_coundown = 0; | 629 | do_coundown = 0; |
628 | octeon_wdt_ping(); | 630 | octeon_wdt_ping(); |
629 | } else { | 631 | } else { |
630 | pr_crit("octeon_wdt: WDT device closed unexpectedly. WDT will not stop!\n"); | 632 | pr_crit("WDT device closed unexpectedly. WDT will not stop!\n"); |
631 | } | 633 | } |
632 | clear_bit(0, &octeon_wdt_is_open); | 634 | clear_bit(0, &octeon_wdt_is_open); |
633 | expect_close = 0; | 635 | expect_close = 0; |
@@ -684,12 +686,12 @@ static int __init octeon_wdt_init(void) | |||
684 | 686 | ||
685 | octeon_wdt_calc_parameters(heartbeat); | 687 | octeon_wdt_calc_parameters(heartbeat); |
686 | 688 | ||
687 | pr_info("octeon_wdt: Initial granularity %d Sec.\n", timeout_sec); | 689 | pr_info("Initial granularity %d Sec\n", timeout_sec); |
688 | 690 | ||
689 | ret = misc_register(&octeon_wdt_miscdev); | 691 | ret = misc_register(&octeon_wdt_miscdev); |
690 | if (ret) { | 692 | if (ret) { |
691 | pr_err("octeon_wdt: cannot register miscdev on minor=%d (err=%d)\n", | 693 | pr_err("cannot register miscdev on minor=%d (err=%d)\n", |
692 | WATCHDOG_MINOR, ret); | 694 | WATCHDOG_MINOR, ret); |
693 | goto out; | 695 | goto out; |
694 | } | 696 | } |
695 | 697 | ||