From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754499AbbKXNwi (ORCPT ); Tue, 24 Nov 2015 08:52:38 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:33253 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753749AbbKXNuT (ORCPT ); Tue, 24 Nov 2015 08:50:19 -0500 From: =?UTF-8?q?Adrien=20Verg=C3=A9?= To: Oliver Neukum Cc: Jiri Kosina , Greg Kroah-Hartman , Logan Gunthorpe , Hans de Goede , Vincent Palatin , =?UTF-8?q?Adrien=20Verg=C3=A9?= , Macpaul Lin , Adel Gadllah , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v3 2/2] USB: quirks: Apply ALWAYS_POLL to all ELAN devices Date: Tue, 24 Nov 2015 14:49:08 +0100 Message-Id: <1448372948-8861-3-git-send-email-adrienverge@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1448372948-8861-1-git-send-email-adrienverge@gmail.com> References: <1448165164-11398-1-git-send-email-adrienverge@gmail.com> <1448372948-8861-1-git-send-email-adrienverge@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All ELAN hid devices seem to require the ALWAYS_POLL quirk. Let's use this quirk for all devices from this vendor, rather than maintaining a list of all its known product IDs. To achieve that, this patch introduces a new hid_vendor_blacklist[] that is checked when the product ID is not found in hid_product_blacklist[]. Tested-by: Adrien Vergé Signed-off-by: Adrien Vergé --- drivers/hid/hid-ids.h | 5 ----- drivers/hid/usbhid/hid-quirks.c | 43 +++++++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index ac1feea..3c7e0c3 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -316,11 +316,6 @@ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 #define USB_VENDOR_ID_ELAN 0x04f3 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B 0x009b -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103 0x0103 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c 0x010c -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F 0x016f #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 94bb137..9550497 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -21,15 +21,29 @@ #include "../hid-ids.h" +struct hid_blacklist { + __u16 idVendor; + __u16 idProduct; + __u32 quirks; +}; + +/* + * Alphabetically sorted blacklist for vendor-global quirks. If a device matches + * both this blacklist and the product one (below), the more specific one + * (product ID) prevails. + */ + +static const struct hid_blacklist hid_vendor_blacklist[] = { + { USB_VENDOR_ID_ELAN, 0, HID_QUIRK_ALWAYS_POLL }, + + { 0, 0, 0 } +}; + /* * Alphabetically sorted blacklist by quirk type. */ -static const struct hid_blacklist { - __u16 idVendor; - __u16 idProduct; - __u32 quirks; -} hid_blacklist[] = { +static const struct hid_blacklist hid_product_blacklist[] = { { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, @@ -72,11 +86,6 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL }, - { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL }, - { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL }, - { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c, HID_QUIRK_ALWAYS_POLL }, - { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, @@ -337,10 +346,16 @@ static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor, const struct hid_blacklist *bl_entry = NULL; int n = 0; - for (; hid_blacklist[n].idVendor; n++) - if (hid_blacklist[n].idVendor == idVendor && - hid_blacklist[n].idProduct == idProduct) - bl_entry = &hid_blacklist[n]; + for (; hid_product_blacklist[n].idVendor; n++) + if (hid_product_blacklist[n].idVendor == idVendor && + hid_product_blacklist[n].idProduct == idProduct) + bl_entry = &hid_product_blacklist[n]; + + if (bl_entry == NULL) { + for (n = 0; hid_vendor_blacklist[n].idVendor; n++) + if (hid_vendor_blacklist[n].idVendor == idVendor) + bl_entry = &hid_vendor_blacklist[n]; + } if (bl_entry != NULL) dbg_hid("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n", -- 2.4.3