1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 3b4739bde05d..504a95e0388f 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -74,6 +74,7 @@ MODULE_LICENSE("GPL");
 #define MT_QUIRK_TOUCH_SIZE_SCALING     BIT(15)
 #define MT_QUIRK_STICKY_FINGERS         BIT(16)
 #define MT_QUIRK_ASUS_CUSTOM_UP         BIT(17)
+#define MT_QUIRK_WIN8_PTP_BUTTONS       BIT(18)
 
 #define MT_INPUTMODE_TOUCHSCREEN        0x02
 #define MT_INPUTMODE_TOUCHPAD           0x03
@@ -241,7 +242,8 @@ static struct mt_class mt_classes[] = {
                         MT_QUIRK_IGNORE_DUPLICATES |
                         MT_QUIRK_HOVERING |
                         MT_QUIRK_CONTACT_CNT_ACCURATE |
-                        MT_QUIRK_STICKY_FINGERS },
+                        MT_QUIRK_STICKY_FINGERS |
+                        MT_QUIRK_WIN8_PTP_BUTTONS },
         { .name = MT_CLS_EXPORT_ALL_INPUTS,
                 .quirks = MT_QUIRK_ALWAYS_VALID |
                         MT_QUIRK_CONTACT_CNT_ACCURATE,
@@ -250,7 +252,8 @@ static struct mt_class mt_classes[] = {
                 .quirks = MT_QUIRK_ALWAYS_VALID |
                         MT_QUIRK_IGNORE_DUPLICATES |
                         MT_QUIRK_HOVERING |
-                        MT_QUIRK_CONTACT_CNT_ACCURATE,
+                        MT_QUIRK_CONTACT_CNT_ACCURATE |
+                        MT_QUIRK_WIN8_PTP_BUTTONS,
                 .export_all_inputs = true },
 
         /*
@@ -659,8 +662,7 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                  * MS PTP spec says that external buttons left and right have
                  * usages 2 and 3.
                  */
-                if ((cls->name == MT_CLS_WIN_8 ||
-                        cls->name == MT_CLS_WIN_8_DUAL) &&
+                if ((cls->quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&
                     field->application == HID_DG_TOUCHPAD &&
                     (usage->hid & HID_USAGE) > 1)
                         code--;
@@ -772,9 +774,7 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input)
  */
 static void mt_sync_frame(struct mt_device *td, struct input_dev *input)
 {
-        __s32 cls = td->mtclass.name;
-
-        if (cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL)
+        if (td->mtclass.quirks & MT_QUIRK_WIN8_PTP_BUTTONS)
                 input_event(input, EV_KEY, BTN_LEFT, td->left_button_state);
 
         input_mt_sync_frame(input);
@@ -826,7 +826,6 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
                                 bool first_packet)
 {
         struct mt_device *td = hid_get_drvdata(hid);
-        __s32 cls = td->mtclass.name;
         __s32 quirks = td->mtclass.quirks;
         struct input_dev *input = field->hidinput->input;
 
@@ -904,7 +903,7 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
                          * non finger/touch events in the first_packet of
                          * a (possible) multi-packet frame.
                          */
-                        if ((cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL) &&
+                        if ((quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&
                             !first_packet)
                                 return;
 
@@ -915,7 +914,7 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
                          * BTN_LEFT if either is pressed, so we or all values
                          * together and report the result in mt_sync_frame().
                          */
-                        if ((cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL) &&
+                        if ((quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&
                             usage->type == EV_KEY && usage->code == BTN_LEFT) {
                                 td->left_button_state |= value;
                                 return;
@@ -939,7 +938,6 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
 static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
 {
         struct mt_device *td = hid_get_drvdata(hid);
-        __s32 cls = td->mtclass.name;
         struct hid_field *field;
         bool first_packet;
         unsigned count;
@@ -968,7 +966,7 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
                  * of a possible multi-packet frame be checking that the
                  * timestamp has changed.
                  */
-                if ((cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL) &&
+                if ((td->mtclass.quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&
                     td->num_received == 0 && td->prev_scantime != scantime)
                         td->num_expected = value;
                 /* A non 0 contact count always indicates a first packet */