* [PATCH 1/2] hid: sort IDs for D-WAV eGalax multitouch devices
@ 2013-05-07 14:29 Andy Shevchenko
2013-05-07 14:29 ` [PATCH 2/2] hid: remove duplicate for D-WAV eGalax 0x7224 Andy Shevchenko
0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2013-05-07 14:29 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 38535c9..2378a0b 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -268,20 +268,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 dc3ae5c..895d140 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1117,34 +1117,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,
@@ -1159,15 +1168,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] 4+ messages in thread* [PATCH 2/2] hid: remove duplicate for D-WAV eGalax 0x7224
2013-05-07 14:29 [PATCH 1/2] hid: sort IDs for D-WAV eGalax multitouch devices Andy Shevchenko
@ 2013-05-07 14:29 ` Andy Shevchenko
2013-05-07 14:34 ` Andy Shevchenko
0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2013-05-07 14:29 UTC (permalink / raw)
To: Jiri Kosina, linux-input, Benjamin Tissoires; +Cc: Andy Shevchenko
There is actually not clear which driver_data ahall be used.
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 2378a0b..a5520ba 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -268,7 +268,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 895d140..383adc9 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1126,9 +1126,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] 4+ messages in thread* Re: [PATCH 2/2] hid: remove duplicate for D-WAV eGalax 0x7224
2013-05-07 14:29 ` [PATCH 2/2] hid: remove duplicate for D-WAV eGalax 0x7224 Andy Shevchenko
@ 2013-05-07 14:34 ` Andy Shevchenko
2013-05-07 14:46 ` Benjamin Tissoires
0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2013-05-07 14:34 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Jiri Kosina, linux-input, Benjamin Tissoires
On Tue, 2013-05-07 at 17:29 +0300, Andy Shevchenko wrote:
> There is actually not clear which driver_data ahall be used.
>
> 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 2378a0b..a5520ba 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -268,7 +268,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 895d140..383adc9 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -1126,9 +1126,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) },
Ah, it seems different device definition.
So, only ID is duplicated.
> { .driver_data = MT_CLS_EGALAX_SERIAL,
> MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
> USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] hid: remove duplicate for D-WAV eGalax 0x7224
2013-05-07 14:34 ` Andy Shevchenko
@ 2013-05-07 14:46 ` Benjamin Tissoires
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Tissoires @ 2013-05-07 14:46 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Jiri Kosina, linux-input
On 05/07/2013 04:34 PM, Andy Shevchenko wrote:
> On Tue, 2013-05-07 at 17:29 +0300, Andy Shevchenko wrote:
>> There is actually not clear which driver_data ahall be used.
>>
>> 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 2378a0b..a5520ba 100644
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -268,7 +268,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 895d140..383adc9 100644
>> --- a/drivers/hid/hid-multitouch.c
>> +++ b/drivers/hid/hid-multitouch.c
>> @@ -1126,9 +1126,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) },
>
> Ah, it seems different device definition.
> So, only ID is duplicated.
Actually the entry is also duplicated in hid-multitouch (not just the
idea). As the first one is always used, you can also remove the second
appearance of USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224.
Cheers,
Benjamin
>
>> { .driver_data = MT_CLS_EGALAX_SERIAL,
>> MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-07 14:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-07 14:29 [PATCH 1/2] hid: sort IDs for D-WAV eGalax multitouch devices Andy Shevchenko
2013-05-07 14:29 ` [PATCH 2/2] hid: remove duplicate for D-WAV eGalax 0x7224 Andy Shevchenko
2013-05-07 14:34 ` Andy Shevchenko
2013-05-07 14:46 ` Benjamin Tissoires
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).