Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> wrote on Sat [2019-Jun-22 23:31:53 -0700]:
> Now that input_mt_report_slot_state() returns true if slot is active we no
> longer need a temporary for the slot state.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Appears to work fine in my test:
Tested-by: Benoit Parrot <bparrot@xxxxxx>
> ---
> drivers/input/touchscreen/edt-ft5x06.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
> index ec770226e119..3cc4341bbdff 100644
> --- a/drivers/input/touchscreen/edt-ft5x06.c
> +++ b/drivers/input/touchscreen/edt-ft5x06.c
> @@ -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);
> --
> 2.22.0.410.gd8fdbe21b5-goog
>
