aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2013-05-17 07:34:48 -0400
committerJiri Kosina <jkosina@suse.cz>2013-05-20 08:48:09 -0400
commitaa672da1b05680f7f087873ae2d02f4a9bf4a829 (patch)
tree21c16fd2ad06c6e723b44ead4eb815cc9ea32e60 /drivers/hid/hid-multitouch.c
parent0b7ddda69263c305375ab88d4272c4a548bf66c0 (diff)
HID: sort IDs for D-WAV eGalax multitouch devices
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> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r--drivers/hid/hid-multitouch.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 1bea65791e45..590aa379609c 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[] = {
1122 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) }, 1122 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
1123 1123
1124 /* eGalax devices (capacitive) */ 1124 /* eGalax devices (capacitive) */
1125 { .driver_data = MT_CLS_EGALAX,
1126 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1127 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
1128 { .driver_data = MT_CLS_EGALAX_SERIAL, 1125 { .driver_data = MT_CLS_EGALAX_SERIAL,
1129 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1126 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1130 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) }, 1127 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) },
1131 { .driver_data = MT_CLS_EGALAX_SERIAL, 1128 { .driver_data = MT_CLS_EGALAX,
1132 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1129 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1133 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) }, 1130 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
1134 { .driver_data = MT_CLS_EGALAX_SERIAL, 1131 { .driver_data = MT_CLS_EGALAX_SERIAL,
1135 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1132 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1136 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, 1133 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
1134 { .driver_data = MT_CLS_EGALAX,
1135 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
1136 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
1137 { .driver_data = MT_CLS_EGALAX_SERIAL, 1137 { .driver_data = MT_CLS_EGALAX_SERIAL,
1138 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1138 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1139 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) }, 1139 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },
1140 { .driver_data = MT_CLS_EGALAX, 1140 { .driver_data = MT_CLS_EGALAX_SERIAL,
1141 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1141 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1142 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) }, 1142 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
1143 { .driver_data = MT_CLS_EGALAX_SERIAL, 1143 { .driver_data = MT_CLS_EGALAX_SERIAL,
1144 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1144 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1145 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) }, 1145 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) },
1146 { .driver_data = MT_CLS_EGALAX, 1146 { .driver_data = MT_CLS_EGALAX,
1147 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1147 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1148 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
1149 { .driver_data = MT_CLS_EGALAX,
1150 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1148 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) }, 1151 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
1149 { .driver_data = MT_CLS_EGALAX_SERIAL, 1152 { .driver_data = MT_CLS_EGALAX_SERIAL,
1150 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1153 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1151 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) }, 1154 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) },
1152 { .driver_data = MT_CLS_EGALAX, 1155 { .driver_data = MT_CLS_EGALAX,
1156 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
1157 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) },
1158 { .driver_data = MT_CLS_EGALAX,
1159 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
1160 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) },
1161 { .driver_data = MT_CLS_EGALAX,
1153 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1162 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1154 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) }, 1163 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },
1155 { .driver_data = MT_CLS_EGALAX, 1164 { .driver_data = MT_CLS_EGALAX,
@@ -1164,15 +1173,6 @@ static const struct hid_device_id mt_devices[] = {
1164 { .driver_data = MT_CLS_EGALAX_SERIAL, 1173 { .driver_data = MT_CLS_EGALAX_SERIAL,
1165 MT_USB_DEVICE(USB_VENDOR_ID_DWAV, 1174 MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
1166 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, 1175 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
1167 { .driver_data = MT_CLS_EGALAX,
1168 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
1169 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
1170 { .driver_data = MT_CLS_EGALAX,
1171 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
1172 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) },
1173 { .driver_data = MT_CLS_EGALAX,
1174 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
1175 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) },
1176 1176
1177 /* Elo TouchSystems IntelliTouch Plus panel */ 1177 /* Elo TouchSystems IntelliTouch Plus panel */
1178 { .driver_data = MT_CLS_DUAL_CONTACT_ID, 1178 { .driver_data = MT_CLS_DUAL_CONTACT_ID,