So we can simplify a few type related if statements

Signed-off-by: Ping Cheng <redacted>
---
 drivers/input/tablet/wacom_sys.c |   10 +++-------
 drivers/input/tablet/wacom_wac.c |    6 ++----
 drivers/input/tablet/wacom_wac.h |    6 +++---
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index b3a8bd3..79b5cfb 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c

@@ -440,8 +440,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat

       /* ask to report Wacom data */
       if (features->device_type == BTN_TOOL_FINGER) {
               /* if it is an MT Tablet PC touch */
-               if (features->type == TABLETPC2FG ||
-                   features->type == MTSCREEN) {
+               if (features->type > TABLETPC) {
                       do {
                               rep_data[0] = 3;
                               rep_data[1] = 4;

@@ -460,7 +459,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat

                       } while ((error < 0 || rep_data[1] != 4) &&
                                limit++ < WAC_MSG_RETRIES);
               }
-       } else if (features->type != TABLETPC &&
+       } else if (features->type <= BAMBOO_PT &&
                  features->type != WIRELESS &&
                  features->device_type == BTN_TOOL_PEN) {
               do {

@@ -510,10 +509,7 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf,

       }

       /* only devices that support touch need to retrieve the info */
-       if (features->type != TABLETPC &&
-           features->type != TABLETPC2FG &&
-           features->type != BAMBOO_PT &&
-           features->type != MTSCREEN) {
+       if (features->type < BAMBOO_PT) {
               goto out;
       }

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 004bc1b..c40dcb7 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c

@@ -1317,10 +1317,8 @@ void wacom_setup_device_quirks(struct wacom_features *features)

       }

       /* these device have multiple inputs */
-       if (features->type == TABLETPC || features->type == TABLETPC2FG ||
-           features->type == BAMBOO_PT || features->type == WIRELESS ||
-           (features->type >= INTUOS5S && features->type <= INTUOS5L) ||
-           features->type == MTSCREEN)
+       if (features->type >= WIRELESS ||
+           (features->type >= INTUOS5S && features->type <= INTUOS5L))
               features->quirks |= WACOM_QUIRK_MULTI_INPUT;

       /* quirk for bamboo touch with 2 low res touches */

diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 78fbd3f..8708043 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h

@@ -62,8 +62,6 @@ enum {

       PTU,
       PL,
       DTU,
-       BAMBOO_PT,
-       WIRELESS,
       INTUOS,
       INTUOS3S,
       INTUOS3,

@@ -79,7 +77,9 @@ enum {

       CINTIQ,
       WACOM_BEE,
       WACOM_MO,
-       TABLETPC,
+       WIRELESS,
+       BAMBOO_PT,
+       TABLETPC,   /* add new TPC below */
       TABLETPC2FG,
       MTSCREEN,
       MAX_TYPE
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html