All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eirin Nya <nyanpasu256@gmail.com>
To: linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Eirin Nya <nyanpasu256@gmail.com>
Subject: [PATCH V2 2/3] Input: elantech - Remove redundant field elantech_data::width
Date: Fri, 14 Oct 2022 04:15:32 -0700	[thread overview]
Message-ID: <20221014111533.908-3-nyanpasu256@gmail.com> (raw)
In-Reply-To: <20221014111533.908-1-nyanpasu256@gmail.com>

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(-)

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


  parent reply	other threads:[~2022-10-14 11:16 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-14 11:15 [PATCH V2 0/3] Input: Fix incorrectly halved touchpad range on ELAN v3 touchpads Eirin Nya
2022-10-14 11:15 ` [PATCH V2 1/3] Input: elantech - Remove redundant field elantech_data::y_max Eirin Nya
2022-10-14 13:10   ` Mattijs Korpershoek
2022-11-28  9:18     ` Eirin Nya
2022-11-28 13:29       ` Mattijs Korpershoek
2022-11-28 18:01         ` Dmitry Torokhov
2022-10-14 11:15 ` Eirin Nya [this message]
2022-10-14 13:14   ` [PATCH V2 2/3] Input: elantech - Remove redundant field elantech_data::width Mattijs Korpershoek
2022-10-14 11:15 ` [PATCH V2 3/3] Input: elantech - Fix incorrectly halved touchpad range on ELAN v3 touchpads Eirin Nya
2022-10-14 13:26   ` Mattijs Korpershoek
2022-11-28 17:57   ` Dmitry Torokhov
2022-11-28 17:58     ` Dmitry Torokhov
2022-11-29  3:47       ` phoenix
2022-11-30 11:22       ` phoenix
2022-12-03  7:42         ` Eirin Nya
2022-12-05 13:28           ` Mattijs Korpershoek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221014111533.908-3-nyanpasu256@gmail.com \
    --to=nyanpasu256@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.