Input: edt-ft5x06 - simplify event reporting code
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 23 Jun 2019 06:21:24 +0000 (23:21 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 5 Jul 2019 17:19:13 +0000 (10:19 -0700)
Now that input_mt_report_slot_state() returns true if slot is active we no
longer need a temporary for the slot state.

Tested-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/edt-ft5x06.c

index ec77022..3cc4341 100644 (file)
@@ -229,7 +229,6 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id)
 
        for (i = 0; i < tsdata->max_support_points; i++) {
                u8 *buf = &rdbuf[i * tplen + offset];
-               bool down;
 
                type = buf[0] >> 6;
                /* ignore Reserved events */
@@ -247,16 +246,12 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id)
                        swap(x, y);
 
                id = (buf[2] >> 4) & 0x0f;
-               down = type != TOUCH_EVENT_UP;
 
                input_mt_slot(tsdata->input, id);
-               input_mt_report_slot_state(tsdata->input, MT_TOOL_FINGER, down);
-
-               if (!down)
-                       continue;
-
-               touchscreen_report_pos(tsdata->input, &tsdata->prop, x, y,
-                                      true);
+               if (input_mt_report_slot_state(tsdata->input, MT_TOOL_FINGER,
+                                              type != TOUCH_EVENT_UP))
+                       touchscreen_report_pos(tsdata->input, &tsdata->prop,
+                                              x, y, true);
        }
 
        input_mt_report_pointer_emulation(tsdata->input, true);