Input: wacom - use switch statement for wacom_tpc_irq()

And add two new data formats.

Tested-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 18 insertions, 6 deletions

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index e18f36232682..9283507b13af 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -832,12 +832,24 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
 
         dbg("wacom_tpc_irq: received report #%d", data[0]);
 
-        if (len == WACOM_PKGLEN_TPC1FG || data[0] == WACOM_REPORT_TPC1FG)
-                return wacom_tpc_single_touch(wacom, len);
-        else if (data[0] == WACOM_REPORT_TPC2FG)
-                return wacom_tpc_mt_touch(wacom);
-        else if (data[0] == WACOM_REPORT_PENABLED)
-                return wacom_tpc_pen(wacom);
+        switch (len) {
+        case WACOM_PKGLEN_TPC1FG:
+                 return wacom_tpc_single_touch(wacom, len);
+
+        case WACOM_PKGLEN_TPC2FG:
+                return wacom_tpc_mt_touch(wacom);
+
+        default:
+                switch (data[0]) {
+                case WACOM_REPORT_TPC1FG:
+                case WACOM_REPORT_TPCHID:
+                case WACOM_REPORT_TPCST:
+                        return wacom_tpc_single_touch(wacom, len);
+
+                case WACOM_REPORT_PENABLED:
+                        return wacom_tpc_pen(wacom);
+                }
+        }
 
         return 0;
 }