Re: [PATCH V2 2/3] Input: elantech - Remove redundant field elantech_data::width

Mattijs Korpershoek
2022-10-14T13:14:17Z

On Fri, Oct 14, 2022 at 04:15, Eirin Nya <nyanpasu256@gmail.com> wrote:

> elantech_data::width is copied from elantech_device_info::width, and
> neither is mutated after initialization. So remove the redundant
> variable to prevent future bugs.
>
> Signed-off-by: Eirin Nya <nyanpasu256@gmail.com>

Same remark as for patch v2 1/3: I already reviewed v1.

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

> ---
> drivers/input/mouse/elantech.c | 4 +---
> drivers/input/mouse/elantech.h | 1 -
> 2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index 79e31611fc..263779c031 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -691,7 +691,7 @@ static void process_packet_head_v4(struct psmouse *psmouse)
> input_report_abs(dev, ABS_MT_POSITION_X, etd->mt[id].x);
> input_report_abs(dev, ABS_MT_POSITION_Y, etd->mt[id].y);
> input_report_abs(dev, ABS_MT_PRESSURE, pres);
> - input_report_abs(dev, ABS_MT_TOUCH_MAJOR, traces * etd->width);
> + input_report_abs(dev, ABS_MT_TOUCH_MAJOR, traces * etd->info.width);
> /* report this for backwards compatibility */
> input_report_abs(dev, ABS_TOOL_WIDTH, traces);
>
> @@ -1253,8 +1253,6 @@ static int elantech_set_input_params(struct psmouse *psmouse)
> input_abs_set_res(dev, ABS_MT_POSITION_Y, info->y_res);
> }
>
> - etd->width = width;
> -
> return 0;
> }
>
> diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
> index 1ec004f72d..fb093134ea 100644
> --- a/drivers/input/mouse/elantech.h
> +++ b/drivers/input/mouse/elantech.h
> @@ -180,7 +180,6 @@ struct elantech_data {
> unsigned char reg_25;
> unsigned char reg_26;
> unsigned int single_finger_reports;
> - unsigned int width;
> struct finger_pos mt[ETP_MAX_FINGERS];
> unsigned char parity[256];
> struct elantech_device_info info;
> --
> 2.38.0