From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: michael@amarulasolutions.com, linux-amarula@amarulasolutions.com,
"Dario Binacchi" <dario.binacchi@amarulasolutions.com>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Oliver Graute" <oliver.graute@kococonnector.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Wolfram Sang" <wsa+renesas@sang-engineering.com>,
linux-input@vger.kernel.org
Subject: [PATCH 5/9] Input: edt-ft5x06 - remove code duplication
Date: Sun, 2 Apr 2023 22:09:47 +0200 [thread overview]
Message-ID: <20230402200951.1032513-6-dario.binacchi@amarulasolutions.com> (raw)
In-Reply-To: <20230402200951.1032513-1-dario.binacchi@amarulasolutions.com>
The use of the macros M06_REG_ADDR and M06_REG_CMD avoids code
duplication without impacting the application load, and reduces the
chances of errors or mistakes.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
drivers/input/touchscreen/edt-ft5x06.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index d4f39724b259..7d82f412ab15 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -75,6 +75,9 @@
#define EDT_DEFAULT_NUM_X 1024
#define EDT_DEFAULT_NUM_Y 1024
+#define M06_REG_CMD(factory) ((factory) ? 0xf3 : 0xfc)
+#define M06_REG_ADDR(factory, addr) ((factory) ? (addr) & 0x7f : (addr) & 0x3f)
+
enum edt_pmode {
EDT_PMODE_NOT_SUPPORTED,
EDT_PMODE_HIBERNATE,
@@ -294,8 +297,8 @@ static int edt_ft5x06_register_write(struct edt_ft5x06_ts_data *tsdata,
switch (tsdata->version) {
case EDT_M06:
- wrbuf[0] = tsdata->factory_mode ? 0xf3 : 0xfc;
- wrbuf[1] = tsdata->factory_mode ? addr & 0x7f : addr & 0x3f;
+ wrbuf[0] = M06_REG_CMD(tsdata->factory_mode);
+ wrbuf[1] = M06_REG_ADDR(tsdata->factory_mode, addr);
wrbuf[2] = value;
wrbuf[3] = wrbuf[0] ^ wrbuf[1] ^ wrbuf[2];
return edt_ft5x06_ts_readwrite(tsdata->client, 4,
@@ -324,8 +327,8 @@ static int edt_ft5x06_register_read(struct edt_ft5x06_ts_data *tsdata,
switch (tsdata->version) {
case EDT_M06:
- wrbuf[0] = tsdata->factory_mode ? 0xf3 : 0xfc;
- wrbuf[1] = tsdata->factory_mode ? addr & 0x7f : addr & 0x3f;
+ wrbuf[0] = M06_REG_CMD(tsdata->factory_mode);
+ wrbuf[1] = M06_REG_ADDR(tsdata->factory_mode, addr);
wrbuf[1] |= tsdata->factory_mode ? 0x80 : 0x40;
error = edt_ft5x06_ts_readwrite(tsdata->client, 2, wrbuf, 2,
--
2.32.0
next prev parent reply other threads:[~2023-04-02 20:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-02 20:09 [PATCH 0/9] Input: edt-ft5x06 - convert to use regmap API Dario Binacchi
2023-04-02 20:09 ` [PATCH 1/9] Input: edt-ft5x06 - fix indentation Dario Binacchi
2023-04-02 20:09 ` [PATCH 2/9] Input: edt-ft5x06 - remove unnecessary blank lines Dario Binacchi
2023-04-02 20:09 ` [PATCH 3/9] Input: edt-ft5x06 - add spaces to ensure format specification Dario Binacchi
2023-04-02 20:09 ` [PATCH 4/9] Input: edt-ft5x06 - don't recalculate the CRC Dario Binacchi
2023-04-02 20:09 ` Dario Binacchi [this message]
2023-04-02 20:09 ` [PATCH 6/9] Input: edt-ft5x06 - don't print error messages with dev_dbg() Dario Binacchi
2023-04-02 20:09 ` [PATCH 7/9] Input: edt-ft5x06 - convert to use regmap API Dario Binacchi
2023-04-02 20:09 ` [PATCH 8/9] Input: edt-ft5x06 - unify the crc check Dario Binacchi
2023-04-02 20:09 ` [PATCH 9/9] Input: edt-ft5x06: Calculate points data length only once Dario Binacchi
2023-04-03 4:40 ` [PATCH 0/9] Input: edt-ft5x06 - convert to use regmap API Dmitry Torokhov
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=20230402200951.1032513-6-dario.binacchi@amarulasolutions.com \
--to=dario.binacchi@amarulasolutions.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@amarulasolutions.com \
--cc=oliver.graute@kococonnector.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=wsa+renesas@sang-engineering.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®