HID: multitouch: cleanup with eGalax PID definitions

commit e36f690b37945e0a9bb1554e1546eeec93f7d1f6 upstream.

This is just a renaming of USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH{N}
to USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_{PID} to handle more eGalax
devices.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 24 insertions, 24 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e7373bfbba8..f4465f1f1bc 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1382,12 +1382,12 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
         { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index c1732e1d197..c4ee677d20b 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -230,12 +230,12 @@
 
 #define USB_VENDOR_ID_DWAV              0x0eef
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER    0x0001
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH    0x480d
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1   0x720c
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2   0x72a1
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3   0x480e
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4   0x726b
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5   0xa001
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D       0x480d
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E       0x480e
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C       0x720c
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B       0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1       0x72a1
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001       0xa001
 
 #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 0099bc4e270..fdf573cb412 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -629,26 +629,26 @@ static const struct hid_device_id mt_devices[] = {
                         USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
 
         /* eGalax devices (resistive) */
-        {  .driver_data = MT_CLS_EGALAX,
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
-        {  .driver_data = MT_CLS_EGALAX,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
 
         /* eGalax devices (capacitive) */
-        {  .driver_data = MT_CLS_EGALAX,
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
-        {  .driver_data = MT_CLS_EGALAX,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
-        {  .driver_data = MT_CLS_EGALAX,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
-        {  .driver_data = MT_CLS_EGALAX,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
 
         /* Elo TouchSystems IntelliTouch Plus panel */
         { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,