HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
Benjamin Tissoires [Thu, 19 May 2011 12:18:18 +0000 (14:18 +0200)]
Stantum devices used to work with MT_CLS_STANTUM but MT_CLS_CONFIDENCE
is exactly the same. This patch switches them to this generic class,
and remove the unused MT_CLS_STANTUM.

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

drivers/hid/hid-multitouch.c

index feeb0b7..65b92d2 100644 (file)
@@ -88,7 +88,6 @@ struct mt_class {
 #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER      3
 #define MT_CLS_CYPRESS                         4
 #define MT_CLS_EGALAX                          5
-#define MT_CLS_STANTUM                         6
 #define MT_CLS_3M                              7
 #define MT_CLS_CONFIDENCE                      8
 #define MT_CLS_CONFIDENCE_MINUS_ONE            9
@@ -154,8 +153,6 @@ struct mt_class mt_classes[] = {
                .sn_move = 4096,
                .sn_pressure = 32,
        },
-       { .name = MT_CLS_STANTUM,
-               .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
        { .name = MT_CLS_3M,
                .quirks = MT_QUIRK_VALID_IS_CONFIDENCE |
                        MT_QUIRK_SLOT_IS_CONTACTID,
@@ -673,13 +670,13 @@ static const struct hid_device_id mt_devices[] = {
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
 
        /* Stantum panels */
-       { .driver_data = MT_CLS_STANTUM,
+       { .driver_data = MT_CLS_CONFIDENCE,
                HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
                        USB_DEVICE_ID_MTP)},
-       { .driver_data = MT_CLS_STANTUM,
+       { .driver_data = MT_CLS_CONFIDENCE,
                HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
                        USB_DEVICE_ID_MTP_STM)},
-       { .driver_data = MT_CLS_STANTUM,
+       { .driver_data = MT_CLS_CONFIDENCE,
                HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
                        USB_DEVICE_ID_MTP_SITRONIX)},