Input: wacom - keep wacom_ids ordered

No Functional changes, just some reordering.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Tested-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 15b0132265e343062fe034c60d4efcd4cb199df9..cd915211fcca67e39b6c1c2f323519be0d82c302 100644 (file)
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -2399,11 +2399,11 @@ static const struct wacom_features wacom_features_0x30E =
 static const struct wacom_features wacom_features_0x6004 =
        { "ISD-V4", 12800, 8000, 255, 0,
          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
-static const struct wacom_features wacom_features_0x0307 =
+static const struct wacom_features wacom_features_0x307 =
        { "Wacom ISDv5 307", 59352, 33648, 2047, 63,
          CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
          .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 };
-static const struct wacom_features wacom_features_0x0309 =
+static const struct wacom_features wacom_features_0x309 =
        { "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
          .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10,
          .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
@@ -2418,6 +2418,7 @@ static const struct wacom_features wacom_features_0x0309 =
 
 const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0x00) },
+       { USB_DEVICE_WACOM(0x03) },
        { USB_DEVICE_WACOM(0x10) },
        { USB_DEVICE_WACOM(0x11) },
        { USB_DEVICE_WACOM(0x12) },
@@ -2428,20 +2429,16 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0x17) },
        { USB_DEVICE_WACOM(0x18) },
        { USB_DEVICE_WACOM(0x19) },
-       { USB_DEVICE_WACOM(0x60) },
-       { USB_DEVICE_WACOM(0x61) },
-       { USB_DEVICE_WACOM(0x62) },
-       { USB_DEVICE_WACOM(0x63) },
-       { USB_DEVICE_WACOM(0x64) },
-       { USB_DEVICE_WACOM(0x65) },
-       { USB_DEVICE_WACOM(0x69) },
-       { USB_DEVICE_WACOM(0x6A) },
-       { USB_DEVICE_WACOM(0x6B) },
        { USB_DEVICE_WACOM(0x20) },
        { USB_DEVICE_WACOM(0x21) },
        { USB_DEVICE_WACOM(0x22) },
        { USB_DEVICE_WACOM(0x23) },
        { USB_DEVICE_WACOM(0x24) },
+       { USB_DEVICE_WACOM(0x26) },
+       { USB_DEVICE_WACOM(0x27) },
+       { USB_DEVICE_WACOM(0x28) },
+       { USB_DEVICE_WACOM(0x29) },
+       { USB_DEVICE_WACOM(0x2A) },
        { USB_DEVICE_WACOM(0x30) },
        { USB_DEVICE_WACOM(0x31) },
        { USB_DEVICE_WACOM(0x32) },
@@ -2451,20 +2448,33 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0x37) },
        { USB_DEVICE_WACOM(0x38) },
        { USB_DEVICE_WACOM(0x39) },
-       { USB_DEVICE_WACOM(0xC4) },
-       { USB_DEVICE_WACOM(0xC0) },
-       { USB_DEVICE_WACOM(0xC2) },
-       { USB_DEVICE_WACOM(0x03) },
+       { USB_DEVICE_WACOM(0x3F) },
        { USB_DEVICE_WACOM(0x41) },
        { USB_DEVICE_WACOM(0x42) },
        { USB_DEVICE_WACOM(0x43) },
        { USB_DEVICE_WACOM(0x44) },
        { USB_DEVICE_WACOM(0x45) },
+       { USB_DEVICE_WACOM(0x47) },
        { USB_DEVICE_WACOM(0x57) },
        { USB_DEVICE_WACOM(0x59) },
-       { USB_DEVICE_WACOM(0x5D) },
        { USB_DEVICE_WACOM(0x5B) },
+       { USB_DEVICE_WACOM(0x5D) },
        { USB_DEVICE_WACOM(0x5E) },
+       { USB_DEVICE_WACOM(0x60) },
+       { USB_DEVICE_WACOM(0x61) },
+       { USB_DEVICE_WACOM(0x62) },
+       { USB_DEVICE_WACOM(0x63) },
+       { USB_DEVICE_WACOM(0x64) },
+       { USB_DEVICE_WACOM(0x65) },
+       { USB_DEVICE_WACOM(0x69) },
+       { USB_DEVICE_WACOM(0x6A) },
+       { USB_DEVICE_WACOM(0x6B) },
+       { USB_DEVICE_WACOM(0x84) },
+       { USB_DEVICE_WACOM(0x90) },
+       { USB_DEVICE_WACOM(0x93) },
+       { USB_DEVICE_WACOM(0x97) },
+       { USB_DEVICE_WACOM(0x9A) },
+       { USB_DEVICE_WACOM(0x9F) },
        { USB_DEVICE_WACOM(0xB0) },
        { USB_DEVICE_WACOM(0xB1) },
        { USB_DEVICE_WACOM(0xB2) },
@@ -2477,17 +2487,14 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0xBA) },
        { USB_DEVICE_WACOM(0xBB) },
        { USB_DEVICE_WACOM(0xBC) },
-       { USB_DEVICE_WACOM(0x26) },
-       { USB_DEVICE_WACOM(0x27) },
-       { USB_DEVICE_WACOM(0x28) },
-       { USB_DEVICE_WACOM(0x29) },
-       { USB_DEVICE_WACOM(0x2A) },
-       { USB_DEVICE_WACOM(0x3F) },
+       { USB_DEVICE_WACOM(0xC0) },
+       { USB_DEVICE_WACOM(0xC2) },
+       { USB_DEVICE_WACOM(0xC4) },
        { USB_DEVICE_WACOM(0xC5) },
        { USB_DEVICE_WACOM(0xC6) },
        { USB_DEVICE_WACOM(0xC7) },
+       { USB_DEVICE_WACOM(0xCC) },
        { USB_DEVICE_WACOM(0xCE) },
-       { USB_DEVICE_WACOM(0x84) },
        { USB_DEVICE_WACOM(0xD0) },
        { USB_DEVICE_WACOM(0xD1) },
        { USB_DEVICE_WACOM(0xD2) },
@@ -2502,13 +2509,6 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0xDD) },
        { USB_DEVICE_WACOM(0xDE) },
        { USB_DEVICE_WACOM(0xDF) },
-       { USB_DEVICE_WACOM(0xF0) },
-       { USB_DEVICE_WACOM(0xCC) },
-       { USB_DEVICE_WACOM(0x90) },
-       { USB_DEVICE_WACOM(0x93) },
-       { USB_DEVICE_WACOM(0x97) },
-       { USB_DEVICE_WACOM(0x9A) },
-       { USB_DEVICE_WACOM(0x9F) },
        { USB_DEVICE_WACOM(0xE2) },
        { USB_DEVICE_WACOM(0xE3) },
        { USB_DEVICE_WACOM(0xE5) },
@@ -2516,6 +2516,12 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0xEC) },
        { USB_DEVICE_WACOM(0xED) },
        { USB_DEVICE_WACOM(0xEF) },
+       { USB_DEVICE_WACOM(0xF0) },
+       { USB_DEVICE_WACOM(0xF4) },
+       { USB_DEVICE_WACOM(0xF6) },
+       { USB_DEVICE_WACOM(0xF8) },
+       { USB_DEVICE_WACOM(0xFA) },
+       { USB_DEVICE_WACOM(0xFB) },
        { USB_DEVICE_WACOM(0x100) },
        { USB_DEVICE_WACOM(0x101) },
        { USB_DEVICE_WACOM(0x10D) },
@@ -2526,8 +2532,10 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0x301) },
        { USB_DEVICE_WACOM(0x302) },
        { USB_DEVICE_WACOM(0x303) },
-       { USB_DEVICE_WACOM(0x30E) },
        { USB_DEVICE_WACOM(0x304) },
+       { USB_DEVICE_WACOM(0x307) },
+       { USB_DEVICE_WACOM(0x309) },
+       { USB_DEVICE_WACOM(0x30E) },
        { USB_DEVICE_WACOM(0x314) },
        { USB_DEVICE_WACOM(0x315) },
        { USB_DEVICE_WACOM(0x317) },
@@ -2535,15 +2543,6 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0x4004) },
        { USB_DEVICE_WACOM(0x5000) },
        { USB_DEVICE_WACOM(0x5002) },
-       { USB_DEVICE_WACOM(0x47) },
-       { USB_DEVICE_WACOM(0xF4) },
-       { USB_DEVICE_WACOM(0xF8) },
-       { USB_DEVICE_WACOM(0xF6) },
-       { USB_DEVICE_WACOM(0xFA) },
-       { USB_DEVICE_WACOM(0xFB) },
-       { USB_DEVICE_WACOM(0x0307) },
-       { USB_DEVICE_WACOM(0x0309) },
-       { USB_DEVICE_LENOVO(0x6004) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, wacom_ids);