diff mbox

[2/2] hid: remove duplicate for D-WAV eGalax 0x7224

Message ID 1367936944-16249-2-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Andy Shevchenko May 7, 2013, 2:29 p.m. UTC 
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(-)

Comments

Andy Shevchenko May 7, 2013, 2:34 p.m. UTC | #1 
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) },
Benjamin Tissoires May 7, 2013, 2:46 p.m. UTC | #2 
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) },
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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) },