aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042-x86ia64io.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-09-09 22:08:16 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-09-11 01:11:36 -0400
commit386b384900a200d5fcabdd4a9c27eb21db606cd4 (patch)
tree5aff549948b9df8fd1f05853856cf174be0c8d1c /drivers/input/serio/i8042-x86ia64io.h
parent5ddbc77c3eb54336fcd44b7b66b44784d65677e2 (diff)
Input: i8042 - use boolean type where it makes sense
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.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 66829a860eec..248a6acf6695 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -550,9 +550,9 @@ static struct dmi_system_id __initdata i8042_dmi_dritek_table[] = {
550#ifdef CONFIG_PNP 550#ifdef CONFIG_PNP
551#include <linux/pnp.h> 551#include <linux/pnp.h>
552 552
553static int i8042_pnp_kbd_registered; 553static bool i8042_pnp_kbd_registered;
554static unsigned int i8042_pnp_kbd_devices; 554static unsigned int i8042_pnp_kbd_devices;
555static int i8042_pnp_aux_registered; 555static bool i8042_pnp_aux_registered;
556static unsigned int i8042_pnp_aux_devices; 556static unsigned int i8042_pnp_aux_devices;
557 557
558static int i8042_pnp_command_reg; 558static int i8042_pnp_command_reg;
@@ -640,12 +640,12 @@ static struct pnp_driver i8042_pnp_aux_driver = {
640static void i8042_pnp_exit(void) 640static void i8042_pnp_exit(void)
641{ 641{
642 if (i8042_pnp_kbd_registered) { 642 if (i8042_pnp_kbd_registered) {
643 i8042_pnp_kbd_registered = 0; 643 i8042_pnp_kbd_registered = false;
644 pnp_unregister_driver(&i8042_pnp_kbd_driver); 644 pnp_unregister_driver(&i8042_pnp_kbd_driver);
645 } 645 }
646 646
647 if (i8042_pnp_aux_registered) { 647 if (i8042_pnp_aux_registered) {
648 i8042_pnp_aux_registered = 0; 648 i8042_pnp_aux_registered = false;
649 pnp_unregister_driver(&i8042_pnp_aux_driver); 649 pnp_unregister_driver(&i8042_pnp_aux_driver);
650 } 650 }
651} 651}
@@ -653,12 +653,12 @@ static void i8042_pnp_exit(void)
653static int __init i8042_pnp_init(void) 653static int __init i8042_pnp_init(void)
654{ 654{
655 char kbd_irq_str[4] = { 0 }, aux_irq_str[4] = { 0 }; 655 char kbd_irq_str[4] = { 0 }, aux_irq_str[4] = { 0 };
656 int pnp_data_busted = 0; 656 int pnp_data_busted = false;
657 int err; 657 int err;
658 658
659#ifdef CONFIG_X86 659#ifdef CONFIG_X86
660 if (dmi_check_system(i8042_dmi_nopnp_table)) 660 if (dmi_check_system(i8042_dmi_nopnp_table))
661 i8042_nopnp = 1; 661 i8042_nopnp = true;
662#endif 662#endif
663 663
664 if (i8042_nopnp) { 664 if (i8042_nopnp) {
@@ -668,11 +668,11 @@ static int __init i8042_pnp_init(void)
668 668
669 err = pnp_register_driver(&i8042_pnp_kbd_driver); 669 err = pnp_register_driver(&i8042_pnp_kbd_driver);
670 if (!err) 670 if (!err)
671 i8042_pnp_kbd_registered = 1; 671 i8042_pnp_kbd_registered = true;
672 672
673 err = pnp_register_driver(&i8042_pnp_aux_driver); 673 err = pnp_register_driver(&i8042_pnp_aux_driver);
674 if (!err) 674 if (!err)
675 i8042_pnp_aux_registered = 1; 675 i8042_pnp_aux_registered = true;
676 676
677 if (!i8042_pnp_kbd_devices && !i8042_pnp_aux_devices) { 677 if (!i8042_pnp_kbd_devices && !i8042_pnp_aux_devices) {
678 i8042_pnp_exit(); 678 i8042_pnp_exit();
@@ -700,9 +700,9 @@ static int __init i8042_pnp_init(void)
700 700
701#if defined(__ia64__) 701#if defined(__ia64__)
702 if (!i8042_pnp_kbd_devices) 702 if (!i8042_pnp_kbd_devices)
703 i8042_nokbd = 1; 703 i8042_nokbd = true;
704 if (!i8042_pnp_aux_devices) 704 if (!i8042_pnp_aux_devices)
705 i8042_noaux = 1; 705 i8042_noaux = true;
706#endif 706#endif
707 707
708 if (((i8042_pnp_data_reg & ~0xf) == (i8042_data_reg & ~0xf) && 708 if (((i8042_pnp_data_reg & ~0xf) == (i8042_data_reg & ~0xf) &&
@@ -713,7 +713,7 @@ static int __init i8042_pnp_init(void)
713 "using default %#x\n", 713 "using default %#x\n",
714 i8042_pnp_data_reg, i8042_data_reg); 714 i8042_pnp_data_reg, i8042_data_reg);
715 i8042_pnp_data_reg = i8042_data_reg; 715 i8042_pnp_data_reg = i8042_data_reg;
716 pnp_data_busted = 1; 716 pnp_data_busted = true;
717 } 717 }
718 718
719 if (((i8042_pnp_command_reg & ~0xf) == (i8042_command_reg & ~0xf) && 719 if (((i8042_pnp_command_reg & ~0xf) == (i8042_command_reg & ~0xf) &&
@@ -724,7 +724,7 @@ static int __init i8042_pnp_init(void)
724 "using default %#x\n", 724 "using default %#x\n",
725 i8042_pnp_command_reg, i8042_command_reg); 725 i8042_pnp_command_reg, i8042_command_reg);
726 i8042_pnp_command_reg = i8042_command_reg; 726 i8042_pnp_command_reg = i8042_command_reg;
727 pnp_data_busted = 1; 727 pnp_data_busted = true;
728 } 728 }
729 729
730 if (!i8042_nokbd && !i8042_pnp_kbd_irq) { 730 if (!i8042_nokbd && !i8042_pnp_kbd_irq) {
@@ -732,7 +732,7 @@ static int __init i8042_pnp_init(void)
732 "PNP: PS/2 controller doesn't have KBD irq; " 732 "PNP: PS/2 controller doesn't have KBD irq; "
733 "using default %d\n", i8042_kbd_irq); 733 "using default %d\n", i8042_kbd_irq);
734 i8042_pnp_kbd_irq = i8042_kbd_irq; 734 i8042_pnp_kbd_irq = i8042_kbd_irq;
735 pnp_data_busted = 1; 735 pnp_data_busted = true;
736 } 736 }
737 737
738 if (!i8042_noaux && !i8042_pnp_aux_irq) { 738 if (!i8042_noaux && !i8042_pnp_aux_irq) {
@@ -741,7 +741,7 @@ static int __init i8042_pnp_init(void)
741 "PNP: PS/2 appears to have AUX port disabled, " 741 "PNP: PS/2 appears to have AUX port disabled, "
742 "if this is incorrect please boot with " 742 "if this is incorrect please boot with "
743 "i8042.nopnp\n"); 743 "i8042.nopnp\n");
744 i8042_noaux = 1; 744 i8042_noaux = true;
745 } else { 745 } else {
746 printk(KERN_WARNING 746 printk(KERN_WARNING
747 "PNP: PS/2 controller doesn't have AUX irq; " 747 "PNP: PS/2 controller doesn't have AUX irq; "
@@ -788,21 +788,21 @@ static int __init i8042_platform_init(void)
788 return retval; 788 return retval;
789 789
790#if defined(__ia64__) 790#if defined(__ia64__)
791 i8042_reset = 1; 791 i8042_reset = true;
792#endif 792#endif
793 793
794#ifdef CONFIG_X86 794#ifdef CONFIG_X86
795 if (dmi_check_system(i8042_dmi_reset_table)) 795 if (dmi_check_system(i8042_dmi_reset_table))
796 i8042_reset = 1; 796 i8042_reset = true;
797 797
798 if (dmi_check_system(i8042_dmi_noloop_table)) 798 if (dmi_check_system(i8042_dmi_noloop_table))
799 i8042_noloop = 1; 799 i8042_noloop = true;
800 800
801 if (dmi_check_system(i8042_dmi_nomux_table)) 801 if (dmi_check_system(i8042_dmi_nomux_table))
802 i8042_nomux = 1; 802 i8042_nomux = true;
803 803
804 if (dmi_check_system(i8042_dmi_dritek_table)) 804 if (dmi_check_system(i8042_dmi_dritek_table))
805 i8042_dritek = 1; 805 i8042_dritek = true;
806#endif /* CONFIG_X86 */ 806#endif /* CONFIG_X86 */
807 807
808 return retval; 808 return retval;