linux-kernel - [PATCH 1/2] input: edt-ft5x06: Do not hardcode register numbers in code, use #define

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1429615193-16794-1-git-send-email-lisovy@jablotron.cz>
Date:	Tue, 21 Apr 2015 13:19:52 +0200
From:	Rostislav Lisovy <lisovy@...il.com>
To:	linux-kernel@...r.kernel.org, linux-input@...r.kernel.org,
	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	Simon Budig <simon.budig@...nelconcepts.de>,
	Daniel Wagener <daniel.wagener@...nelconcepts.de>,
	Lothar Waßmann <LW@...O-electronics.de>,
	lisovy@...lotron.cz
Subject: [PATCH 1/2] input: edt-ft5x06: Do not hardcode register numbers in code, use #define

Signed-off-by: Rostislav Lisovy <lisovy@...lotron.cz>
---
 drivers/input/touchscreen/edt-ft5x06.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index e6aef3e..c938d4b 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -48,6 +48,9 @@
 #define WORK_REGISTER_OFFSET		0x31
 #define WORK_REGISTER_NUM_X		0x33
 #define WORK_REGISTER_NUM_Y		0x34
+#define WORK_REGISTER_FW_ID		0xA6
+#define WORK_REGISTER_FT_ID		0xA8
+#define WORK_REGISTER_FW_VER		0xBB
 
 #define M09_REGISTER_THRESHOLD		0x80
 #define M09_REGISTER_GAIN		0x92
@@ -799,14 +802,16 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
 	char *p;
 	int error;
 	char *model_name = tsdata->name;
+	u8 cmd;
 
 	/* see what we find if we assume it is a M06 *
 	 * if we get less than EDT_NAME_LEN, we don't want
 	 * to have garbage in there
 	 */
 	memset(rdbuf, 0, sizeof(rdbuf));
-	error = edt_ft5x06_ts_readwrite(client, 1, "\xbb",
-					EDT_NAME_LEN - 1, rdbuf);
+	cmd = WORK_REGISTER_FW_VER;
+	error = edt_ft5x06_ts_readwrite(client, 1, &cmd, EDT_NAME_LEN - 1,
+					rdbuf);
 	if (error)
 		return error;
 
@@ -831,15 +836,15 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
 		/* since there are only two versions around (M06, M09) */
 		tsdata->version = M09;
 
-		error = edt_ft5x06_ts_readwrite(client, 1, "\xA6",
-						2, rdbuf);
+		cmd = WORK_REGISTER_FW_ID;
+		error = edt_ft5x06_ts_readwrite(client, 1, &cmd, 2, rdbuf);
 		if (error)
 			return error;
 
 		strlcpy(fw_version, rdbuf, 2);
 
-		error = edt_ft5x06_ts_readwrite(client, 1, "\xA8",
-						1, rdbuf);
+		cmd = WORK_REGISTER_FT_ID;
+		error = edt_ft5x06_ts_readwrite(client, 1, &cmd, 1, rdbuf);
 		if (error)
 			return error;
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/