diff options
author | Joe Perches <joe@perches.com> | 2010-11-30 02:33:07 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-01 02:10:20 -0500 |
commit | 4eb3c30b2e034b673df3e8f21b497e39f3911a02 (patch) | |
tree | 013e473ebaee813ccbc7e5dfeed19cd6fe8fa3de /drivers/input/serio/i8042-x86ia64io.h | |
parent | b029ffafe89cf4b97cf39e0225a5205cbbf9e02f (diff) |
Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ use
Standardized message logging prefixes.
Removed \n from dbg macro, added \n to each dbg call site.
Removed direct use of __FILE__ from dbg, converted to pr_fmt(fmt)
Added non-debug printf argument verification of dbg calls
Removed "i8042.c" from printks, converted to pr_<level>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
-rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index a5475b57708..cd9ff808bd2 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
@@ -752,7 +752,7 @@ static int __init i8042_pnp_init(void) | |||
752 | #endif | 752 | #endif |
753 | 753 | ||
754 | if (i8042_nopnp) { | 754 | if (i8042_nopnp) { |
755 | printk(KERN_INFO "i8042: PNP detection disabled\n"); | 755 | pr_info("PNP detection disabled\n"); |
756 | return 0; | 756 | return 0; |
757 | } | 757 | } |
758 | 758 | ||
@@ -769,7 +769,7 @@ static int __init i8042_pnp_init(void) | |||
769 | #if defined(__ia64__) | 769 | #if defined(__ia64__) |
770 | return -ENODEV; | 770 | return -ENODEV; |
771 | #else | 771 | #else |
772 | printk(KERN_INFO "PNP: No PS/2 controller found. Probing ports directly.\n"); | 772 | pr_info("PNP: No PS/2 controller found. Probing ports directly.\n"); |
773 | return 0; | 773 | return 0; |
774 | #endif | 774 | #endif |
775 | } | 775 | } |
@@ -781,7 +781,7 @@ static int __init i8042_pnp_init(void) | |||
781 | snprintf(aux_irq_str, sizeof(aux_irq_str), | 781 | snprintf(aux_irq_str, sizeof(aux_irq_str), |
782 | "%d", i8042_pnp_aux_irq); | 782 | "%d", i8042_pnp_aux_irq); |
783 | 783 | ||
784 | printk(KERN_INFO "PNP: PS/2 Controller [%s%s%s] at %#x,%#x irq %s%s%s\n", | 784 | pr_info("PNP: PS/2 Controller [%s%s%s] at %#x,%#x irq %s%s%s\n", |
785 | i8042_pnp_kbd_name, (i8042_pnp_kbd_devices && i8042_pnp_aux_devices) ? "," : "", | 785 | i8042_pnp_kbd_name, (i8042_pnp_kbd_devices && i8042_pnp_aux_devices) ? "," : "", |
786 | i8042_pnp_aux_name, | 786 | i8042_pnp_aux_name, |
787 | i8042_pnp_data_reg, i8042_pnp_command_reg, | 787 | i8042_pnp_data_reg, i8042_pnp_command_reg, |
@@ -798,9 +798,7 @@ static int __init i8042_pnp_init(void) | |||
798 | if (((i8042_pnp_data_reg & ~0xf) == (i8042_data_reg & ~0xf) && | 798 | if (((i8042_pnp_data_reg & ~0xf) == (i8042_data_reg & ~0xf) && |
799 | i8042_pnp_data_reg != i8042_data_reg) || | 799 | i8042_pnp_data_reg != i8042_data_reg) || |
800 | !i8042_pnp_data_reg) { | 800 | !i8042_pnp_data_reg) { |
801 | printk(KERN_WARNING | 801 | pr_warn("PNP: PS/2 controller has invalid data port %#x; using default %#x\n", |
802 | "PNP: PS/2 controller has invalid data port %#x; " | ||
803 | "using default %#x\n", | ||
804 | i8042_pnp_data_reg, i8042_data_reg); | 802 | i8042_pnp_data_reg, i8042_data_reg); |
805 | i8042_pnp_data_reg = i8042_data_reg; | 803 | i8042_pnp_data_reg = i8042_data_reg; |
806 | pnp_data_busted = true; | 804 | pnp_data_busted = true; |
@@ -809,33 +807,27 @@ static int __init i8042_pnp_init(void) | |||
809 | if (((i8042_pnp_command_reg & ~0xf) == (i8042_command_reg & ~0xf) && | 807 | if (((i8042_pnp_command_reg & ~0xf) == (i8042_command_reg & ~0xf) && |
810 | i8042_pnp_command_reg != i8042_command_reg) || | 808 | i8042_pnp_command_reg != i8042_command_reg) || |
811 | !i8042_pnp_command_reg) { | 809 | !i8042_pnp_command_reg) { |
812 | printk(KERN_WARNING | 810 | pr_warn("PNP: PS/2 controller has invalid command port %#x; using default %#x\n", |
813 | "PNP: PS/2 controller has invalid command port %#x; " | ||
814 | "using default %#x\n", | ||
815 | i8042_pnp_command_reg, i8042_command_reg); | 811 | i8042_pnp_command_reg, i8042_command_reg); |
816 | i8042_pnp_command_reg = i8042_command_reg; | 812 | i8042_pnp_command_reg = i8042_command_reg; |
817 | pnp_data_busted = true; | 813 | pnp_data_busted = true; |
818 | } | 814 | } |
819 | 815 | ||
820 | if (!i8042_nokbd && !i8042_pnp_kbd_irq) { | 816 | if (!i8042_nokbd && !i8042_pnp_kbd_irq) { |
821 | printk(KERN_WARNING | 817 | pr_warn("PNP: PS/2 controller doesn't have KBD irq; using default %d\n", |
822 | "PNP: PS/2 controller doesn't have KBD irq; " | 818 | i8042_kbd_irq); |
823 | "using default %d\n", i8042_kbd_irq); | ||
824 | i8042_pnp_kbd_irq = i8042_kbd_irq; | 819 | i8042_pnp_kbd_irq = i8042_kbd_irq; |
825 | pnp_data_busted = true; | 820 | pnp_data_busted = true; |
826 | } | 821 | } |
827 | 822 | ||
828 | if (!i8042_noaux && !i8042_pnp_aux_irq) { | 823 | if (!i8042_noaux && !i8042_pnp_aux_irq) { |
829 | if (!pnp_data_busted && i8042_pnp_kbd_irq) { | 824 | if (!pnp_data_busted && i8042_pnp_kbd_irq) { |
830 | printk(KERN_WARNING | 825 | pr_warn("PNP: PS/2 appears to have AUX port disabled, " |
831 | "PNP: PS/2 appears to have AUX port disabled, " | 826 | "if this is incorrect please boot with i8042.nopnp\n"); |
832 | "if this is incorrect please boot with " | ||
833 | "i8042.nopnp\n"); | ||
834 | i8042_noaux = true; | 827 | i8042_noaux = true; |
835 | } else { | 828 | } else { |
836 | printk(KERN_WARNING | 829 | pr_warn("PNP: PS/2 controller doesn't have AUX irq; using default %d\n", |
837 | "PNP: PS/2 controller doesn't have AUX irq; " | 830 | i8042_aux_irq); |
838 | "using default %d\n", i8042_aux_irq); | ||
839 | i8042_pnp_aux_irq = i8042_aux_irq; | 831 | i8042_pnp_aux_irq = i8042_aux_irq; |
840 | } | 832 | } |
841 | } | 833 | } |