hid: sort id list for eGalax and remove dups
v3 cover hid: sort id list for eGalax and remove dups
Third version of the patches addresses comments I got from Benjamin and Jiri. The actual change is the commit message for patch 2/2. Patch itself is remained as in the first version.
Andy Shevchenko (2):
hid: sort IDs for D-WAV eGalax multitouch devices
hid: remove duplicate ID for D-WAV eGalax 0x7224
drivers/hid/hid-ids.h | 7 +++---- drivers/hid/hid-multitouch.c | 29 +++++++++++++---------------- 2 files changed, 16 insertions(+), 20 deletions(-)
Signature · 1 line
1.8.2.rc0.22.gb3600c3
PATCH v3 1/2 hid: sort IDs for D-WAV eGalax multitouch devices
Just sort the list by IDs. There is no functional change.
--- drivers/hid/hid-ids.h | 8 ++++---- drivers/hid/hid-multitouch.c | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-)
drivers/hid/hid-ids.h +4 -4
@@ -271,20 +271,20 @@#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A 0x722A#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E 0x725e#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262 0x7262#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B 0x726b -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA 0x72aa#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1 0x72a1 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA 0x72aa +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4 0x72c4 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0 0x72d0#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA 0x72fa#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302 0x7302#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349 0x7349#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7 0x73f7#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0 0x72d0 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4 0x72c4#define USB_VENDOR_ID_ELECOM 0x056e#define USB_DEVICE_ID_ELECOM_BM084 0x0061
drivers/hid/hid-multitouch.c +16 -16
@@ -1122,34 +1122,43 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },/* eGalax devices (capacitive) */ - { .driver_data = MT_CLS_EGALAX, -MT_USB_DEVICE (USB_VENDOR_ID_DWAV , - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) }, { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) }, - { .driver_data = MT_CLS_EGALAX_SERIAL, + { .driver_data = MT_CLS_EGALAX,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) }, + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) }, { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, + { .driver_data = MT_CLS_EGALAX, +HID_USB_DEVICE (USB_VENDOR_ID_DWAV , + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) }, - { .driver_data = MT_CLS_EGALAX, + { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) }, + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) }, { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) }, { .driver_data = MT_CLS_EGALAX,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) }, + { .driver_data = MT_CLS_EGALAX, +MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) }, { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) }, { .driver_data = MT_CLS_EGALAX, +HID_USB_DEVICE (USB_VENDOR_ID_DWAV , + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) }, + { .driver_data = MT_CLS_EGALAX, +HID_USB_DEVICE (USB_VENDOR_ID_DWAV , + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) }, + { .driver_data = MT_CLS_EGALAX,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) }, { .driver_data = MT_CLS_EGALAX,
@@ -1164,15 +1173,6 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, - { .driver_data = MT_CLS_EGALAX, -HID_USB_DEVICE (USB_VENDOR_ID_DWAV , - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, - { .driver_data = MT_CLS_EGALAX, -HID_USB_DEVICE (USB_VENDOR_ID_DWAV , - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) }, - { .driver_data = MT_CLS_EGALAX, -HID_USB_DEVICE (USB_VENDOR_ID_DWAV , - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) }, /* Elo TouchSystems IntelliTouch Plus panel */ { .driver_data = MT_CLS_DUAL_CONTACT_ID,
Signature · 1 line
1.8.2.rc0.22.gb3600c3
Re: [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices
Quoted 4 lines · Andy Shevchenko
Just sort the list by IDs. There is no functional change.
Signed-off-by Andy Shevchenko <[email protected]>---
PATCH v3 2/2 hid: remove duplicate ID for D-WAV eGalax 0x7224
In reply to Andy ShevchenkoThis patch also removes the duplicate entry in the hid-multitouch.c as suggested by Benjamin Tissoires.
--- drivers/hid/hid-ids.h | 1 - drivers/hid/hid-multitouch.c | 3 --- 2 files changed, 4 deletions(-)
drivers/hid/hid-ids.h +0 -1
@@ -271,7 +271,6 @@#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A 0x722A#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E 0x725e#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262 0x7262
drivers/hid/hid-multitouch.c +0 -3
@@ -1131,9 +1131,6 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, - { .driver_data = MT_CLS_EGALAX, -HID_USB_DEVICE (USB_VENDOR_ID_DWAV , - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },
Signature · 1 line
1.8.2.rc0.22.gb3600c3
Re: [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224
Quoted 5 lines · Andy Shevchenko
This patch also removes the duplicate entry in the
hid-multitouch.cas suggested by Benjamin Tissoires.Signed-off-by Andy Shevchenko <[email protected]>---
Thanks Andy for the re-spin.
Cheers,
Benjamin
Jiri Kosina
AppliedQuoted 11 lines · Andy Shevchenko
Third version of the patches addresses comments I got from Benjamin and Jiri. The actual change is the commit message for patch 2/2. Patch itself is remained as in the first version.
Andy Shevchenko (2):
hid: sort IDs for D-WAV eGalax multitouch devices
hid: remove duplicate ID for D-WAV eGalax0x7224drivers/hid/hid-ids.h | 7 +++---- drivers/hid/hid-multitouch.c | 29 +++++++++++++---------------- 2 files changed, 16 insertions(+), 20 deletions(-)
Applied, thanks.
Signature · 2 lines
Jiri Kosina SUSE Labs