Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5480a40 authored by Shantanu Jain's avatar Shantanu Jain
Browse files

input: touchscreen: Use macros for magic numbers in Goodix drivers 



Use macros instead of  magic numbers for maximum i2c retries in
Goodix driver.

CRs-fixed: 554725
Change-Id: I9f7da9f43418cd1d423aaf331f41d37d13f248d4
Signed-off-by: default avatarShantanu Jain <shjain@codeaurora.org>
parent 4a149ed1

drivers/input/touchscreen/gt9xx/gt9xx.c

+17 −17
Original line number Diff line number Diff line
@@ -156,13 +156,13 @@ int gtp_i2c_read(struct i2c_client *client, u8 *buf, int len) 
		},

	};



	for (retries = 0; retries < 5; retries++) {

	for (retries = 0; retries < GTP_I2C_RETRY_5; retries++) {

		ret = i2c_transfer(client->adapter, msgs, 2);

		if (ret == 2)

			break;

		dev_err(&client->dev, "I2C retry: %d\n", retries + 1);

	}

	if (retries == 5) {

	if (retries == GTP_I2C_RETRY_5) {

#if GTP_SLIDE_WAKEUP

		/* reset chip would quit doze mode */

		if (DOZE_ENABLED == doze_status)
@@ -202,13 +202,13 @@ int gtp_i2c_write(struct i2c_client *client, u8 *buf, int len) 
		.buf = buf,

	};



	for (retries = 0; retries < 5; retries++) {

	for (retries = 0; retries < GTP_I2C_RETRY_5; retries++) {

		ret = i2c_transfer(client->adapter, &msg, 1);

		if (ret == 1)

			break;

		dev_err(&client->dev, "I2C retry: %d\n", retries + 1);

	}

	if ((retries == 5)) {

	if ((retries == GTP_I2C_RETRY_5)) {

#if GTP_SLIDE_WAKEUP

		if (DOZE_ENABLED == doze_status)

			return ret;
@@ -242,7 +242,7 @@ int gtp_i2c_read_dbl_check(struct i2c_client *client, 
	u8 confirm_buf[16] = {0};

	u8 retry = 0;



	while (retry++ < 3) {

	while (retry++ < GTP_I2C_RETRY_3) {

		memset(buf, 0xAA, 16);

		buf[0] = (u8)(addr >> 8);

		buf[1] = (u8)(addr & 0xFF);
@@ -256,7 +256,7 @@ int gtp_i2c_read_dbl_check(struct i2c_client *client, 
		if (!memcmp(buf, confirm_buf, len + 2))

			break;

	}

	if (retry < 3) {

	if (retry < GTP_I2C_RETRY_3) {

		memcpy(rxbuf, confirm_buf + 2, len);

		return SUCCESS;

	} else {
@@ -287,7 +287,7 @@ static int gtp_send_cfg(struct goodix_ts_data *ts) 
			"Ic fixed config, no config sent!");

		ret = 2;

	} else {

		for (retry = 0; retry < 5; retry++) {

		for (retry = 0; retry < GTP_I2C_RETRY_5; retry++) {

			ret = gtp_i2c_write(ts->client,

				ts->config_data,

				GTP_CONFIG_MAX_LENGTH + GTP_ADDR_LENGTH);
@@ -727,7 +727,7 @@ static s8 gtp_enter_doze(struct goodix_ts_data *ts) 
#endif

	gtp_irq_disable(ts);



	while (retry++ < 5) {

	while (retry++ < GTP_I2C_RETRY_3) {

		i2c_control_buf[0] = 0x80;

		i2c_control_buf[1] = 0x46;

		ret = gtp_i2c_write(ts->client, i2c_control_buf, 3);
@@ -773,7 +773,7 @@ static s8 gtp_enter_sleep(struct goodix_ts_data *ts) 


	ret = gpio_direction_output(ts->pdata->irq_gpio, 0);

	usleep(5000);

	while (retry++ < 5) {

	while (retry++ < GTP_I2C_RETRY_5) {

		ret = gtp_i2c_write(ts->client, i2c_control_buf, 3);

		if (ret > 0) {

			dev_dbg(&ts->client->dev,
@@ -811,7 +811,7 @@ static s8 gtp_wakeup_sleep(struct goodix_ts_data *ts) 
		return 1;

	}

#else

	while (retry++ < 10) {

	while (retry++ < GTP_I2C_RETRY_10) {

#if GTP_SLIDE_WAKEUP

		/* wakeup not by slide */

		if (DOZE_WAKEUP != doze_status)
@@ -1102,7 +1102,7 @@ Output: 
static int gtp_i2c_test(struct i2c_client *client)

{

	u8 buf[3] = { GTP_REG_CONFIG_DATA >> 8, GTP_REG_CONFIG_DATA & 0xff };

	int retry = 5;

	int retry = GTP_I2C_RETRY_5;

	int ret = -EIO;



	while (retry--) {
@@ -2060,13 +2060,13 @@ static int gtp_init_ext_watchdog(struct i2c_client *client) 
	msg.len   = 4;

	msg.buf   = opr_buffer;



	while (retries < 5) {

	while (retries < GTP_I2C_RETRY_5) {

		ret = i2c_transfer(client->adapter, &msg, 1);

		if (ret == 1)

			return 1;

		retries++;

	}

	if (retries >= 5)

	if (retries == GTP_I2C_RETRY_5)

		dev_err(&client->dev, "init external watchdog failed!");

	return 0;

}
@@ -2082,7 +2082,7 @@ Output: 
*******************************************************/

static void gtp_esd_check_func(struct work_struct *work)

{

	s32 i;

	s32 retry;

	s32 ret = -1;

	struct goodix_ts_data *ts = NULL;

	u8 test[4] = {0x80, 0x40};
@@ -2099,7 +2099,7 @@ static void gtp_esd_check_func(struct work_struct *work) 
		return;

#endif



	for (i = 0; i < 3; i++) {

	for (retry = 0; retry < GTP_I2C_RETRY_3; retry++) {

		ret = gtp_i2c_read(ts->client, test, 4);



		if ((ret < 0)) {
@@ -2108,7 +2108,7 @@ static void gtp_esd_check_func(struct work_struct *work) 
		} else {

			if ((test[2] == 0xAA) || (test[3] != 0xAA)) {

				/* IC works abnormally..*/

				i = 3;

				retry = GTP_I2C_RETRY_3;

				break;

			} else {

				/* IC works normally, Write 0x8040 0xAA*/
@@ -2118,7 +2118,7 @@ static void gtp_esd_check_func(struct work_struct *work) 
			}

		}

	}

	if (i >= 3) {

	if (retry == GTP_I2C_RETRY_3) {

		dev_err(&ts->client->dev,

			"IC Working ABNORMALLY, Resetting Guitar...\n");

		gtp_reset_guitar(ts, 50);

drivers/input/touchscreen/gt9xx/gt9xx.h

+4 −0
Original line number Diff line number Diff line
@@ -232,6 +232,10 @@ extern u16 total_len; 
#define GTP_REG_FW_VERSION	0x8144

#define GTP_REG_PRODUCT_ID	0x8140



#define GTP_I2C_RETRY_3		3

#define GTP_I2C_RETRY_5		5

#define GTP_I2C_RETRY_10	10



#define RESOLUTION_LOC		3

#define TRIGGER_LOC		8