| Message ID | 20220929082119.22112-3-nyanpasu256@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Input: Fix incorrectly halved touchpad range on ELAN v3 touchpads | expand |
On Thu, Sep 29, 2022 at 01:21, 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> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> ps: please consider using the proper subject line for input subsystem if you need to send again. It should be "Input: elantech - Remove redundant field elantech_data::width" $ git log --oneline drivers/input/mouse/elantech.c shows: 1d72d9f960cc Input: elantech - fix stack out of bound access in elantech_change_report_id() be896bd3b72b Input: elantench - fix misreporting trackpoint coordinates 9d383e96448d Input: elantech - Prepare a complete software node for the device (this is a minor remark, so no need to send a v2 to just change the subject line) Cheers Mattijs > --- > 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.37.3
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;
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> --- drivers/input/mouse/elantech.c | 4 +--- drivers/input/mouse/elantech.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)