* [PATCH v3 0/2] hid: sort id list for eGalax and remove dups
@ 2013-05-17 11:34 Andy Shevchenko
2013-05-17 11:34 ` [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices Andy Shevchenko
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andy Shevchenko @ 2013-05-17 11:34 UTC (permalink / raw)
To: Jiri Kosina, linux-input, Benjamin Tissoires; +Cc: 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 eGalax 0x7224
drivers/hid/hid-ids.h | 7 +++----
drivers/hid/hid-multitouch.c | 29 +++++++++++++----------------
2 files changed, 16 insertions(+), 20 deletions(-)
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices
2013-05-17 11:34 [PATCH v3 0/2] hid: sort id list for eGalax and remove dups Andy Shevchenko
@ 2013-05-17 11:34 ` Andy Shevchenko
2013-05-17 12:19 ` Benjamin Tissoires
2013-05-17 11:34 ` [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224 Andy Shevchenko
2013-05-20 12:50 ` [PATCH v3 0/2] hid: sort id list for eGalax and remove dups Jiri Kosina
2 siblings, 1 reply; 6+ messages in thread
From: Andy Shevchenko @ 2013-05-17 11:34 UTC (permalink / raw)
To: Jiri Kosina, linux-input, Benjamin Tissoires; +Cc: Andy Shevchenko
Just sort the list by IDs. There is no functional change.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/hid/hid-ids.h | 8 ++++----
drivers/hid/hid-multitouch.c | 32 ++++++++++++++++----------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 0b4598a..5b7e148 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -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
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 1bea657..590aa37 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -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,
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224
2013-05-17 11:34 [PATCH v3 0/2] hid: sort id list for eGalax and remove dups Andy Shevchenko
2013-05-17 11:34 ` [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices Andy Shevchenko
@ 2013-05-17 11:34 ` Andy Shevchenko
2013-05-17 12:19 ` Benjamin Tissoires
2013-05-20 12:50 ` [PATCH v3 0/2] hid: sort id list for eGalax and remove dups Jiri Kosina
2 siblings, 1 reply; 6+ messages in thread
From: Andy Shevchenko @ 2013-05-17 11:34 UTC (permalink / raw)
To: Jiri Kosina, linux-input, Benjamin Tissoires; +Cc: Andy Shevchenko
This patch also removes the duplicate entry in the hid-multitouch.c as
suggested by Benjamin Tissoires.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/hid/hid-ids.h | 1 -
drivers/hid/hid-multitouch.c | 3 ---
2 files changed, 4 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 5b7e148..8add4ae 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -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
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 590aa37..d99b959 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -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) },
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices
2013-05-17 11:34 ` [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices Andy Shevchenko
@ 2013-05-17 12:19 ` Benjamin Tissoires
0 siblings, 0 replies; 6+ messages in thread
From: Benjamin Tissoires @ 2013-05-17 12:19 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Jiri Kosina, linux-input, Benjamin Tissoires
On Fri, May 17, 2013 at 1:34 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Just sort the list by IDs. There is no functional change.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
Reviewed-By: Benjamin Tissoires <benjamin.tissoires@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224
2013-05-17 11:34 ` [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224 Andy Shevchenko
@ 2013-05-17 12:19 ` Benjamin Tissoires
0 siblings, 0 replies; 6+ messages in thread
From: Benjamin Tissoires @ 2013-05-17 12:19 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Jiri Kosina, linux-input, Benjamin Tissoires
On Fri, May 17, 2013 at 1:34 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> This patch also removes the duplicate entry in the hid-multitouch.c as
> suggested by Benjamin Tissoires.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
Reviewed-By: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Thanks Andy for the re-spin.
Cheers,
Benjamin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/2] hid: sort id list for eGalax and remove dups
2013-05-17 11:34 [PATCH v3 0/2] hid: sort id list for eGalax and remove dups Andy Shevchenko
2013-05-17 11:34 ` [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices Andy Shevchenko
2013-05-17 11:34 ` [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224 Andy Shevchenko
@ 2013-05-20 12:50 ` Jiri Kosina
2 siblings, 0 replies; 6+ messages in thread
From: Jiri Kosina @ 2013-05-20 12:50 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: linux-input, Benjamin Tissoires
On Fri, 17 May 2013, Andy Shevchenko wrote:
> 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(-)
Applied, thanks.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-20 12:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-17 11:34 [PATCH v3 0/2] hid: sort id list for eGalax and remove dups Andy Shevchenko
2013-05-17 11:34 ` [PATCH v3 1/2] hid: sort IDs for D-WAV eGalax multitouch devices Andy Shevchenko
2013-05-17 12:19 ` Benjamin Tissoires
2013-05-17 11:34 ` [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224 Andy Shevchenko
2013-05-17 12:19 ` Benjamin Tissoires
2013-05-20 12:50 ` [PATCH v3 0/2] hid: sort id list for eGalax and remove dups Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).