aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorGiedrius Statkevičius <giedriuswork@gmail.com>2014-10-17 19:57:20 -0400
committerDarren Hart <dvhart@linux.intel.com>2014-11-19 12:07:07 -0500
commit98280374ff1750acfa582a4575b94f053a29f749 (patch)
treeed33958666ad98949cdf8f2cc463fca2c63171b9 /drivers/platform
parentfc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff)
drivers: platform: change 0x20 to I8042_STR_AUXDATA in i8042 filters
Instead of using a magic constant 0x20 in some drivers to get data only from the KBC port we should use the constant defined in i8042.h with the same value. Also, this makes these drivers uniform with what constant the only other filter function uses in drivers/input/misc/ideapad_slidebar.c. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/dell-laptop.c2
-rw-r--r--drivers/platform/x86/msi-laptop.c2
-rw-r--r--drivers/platform/x86/toshiba_acpi.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 233d2ee598a6..60bfc8ebc541 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -564,7 +564,7 @@ static bool dell_laptop_i8042_filter(unsigned char data, unsigned char str,
564{ 564{
565 static bool extended; 565 static bool extended;
566 566
567 if (str & 0x20) 567 if (str & I8042_STR_AUXDATA)
568 return false; 568 return false;
569 569
570 if (unlikely(data == 0xe0)) { 570 if (unlikely(data == 0xe0)) {
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 62f8030b9e77..206a7d964d40 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -821,7 +821,7 @@ static bool msi_laptop_i8042_filter(unsigned char data, unsigned char str,
821{ 821{
822 static bool extended; 822 static bool extended;
823 823
824 if (str & 0x20) 824 if (str & I8042_STR_AUXDATA)
825 return false; 825 return false;
826 826
827 /* 0x54 wwan, 0x62 bluetooth, 0x76 wlan, 0xE4 touchpad toggle*/ 827 /* 0x54 wwan, 0x62 bluetooth, 0x76 wlan, 0xE4 touchpad toggle*/
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index ab6151f05420..96076d99cf33 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1589,7 +1589,7 @@ static umode_t toshiba_sysfs_is_visible(struct kobject *kobj,
1589static bool toshiba_acpi_i8042_filter(unsigned char data, unsigned char str, 1589static bool toshiba_acpi_i8042_filter(unsigned char data, unsigned char str,
1590 struct serio *port) 1590 struct serio *port)
1591{ 1591{
1592 if (str & 0x20) 1592 if (str & I8042_STR_AUXDATA)
1593 return false; 1593 return false;
1594 1594
1595 if (unlikely(data == 0xe0)) 1595 if (unlikely(data == 0xe0))