Commit 7642f29c authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov
Browse files

Input: goodix - push error logging up into i2c_read and i2c_write helpers 



Make the goodix_i2c_read() and goodix_i2c_write*() helpers log errors
themselves. This allows removing all the error logging from their callers.

This already results in a nice cleanup with the current code and it also
helps to make the upcoming support for controllers without flash cleaner.

Reviewed-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210920150643.155872-5-hdegoede@redhat.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 209bda47

drivers/input/touchscreen/goodix.c

+23 −30
Original line number Diff line number Diff line
@@ -217,7 +217,13 @@ int goodix_i2c_read(struct i2c_client *client, u16 reg, u8 *buf, int len) 
	msgs[1].buf   = buf;



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

	return ret < 0 ? ret : (ret != ARRAY_SIZE(msgs) ? -EIO : 0);

	if (ret >= 0)

		ret = (ret == ARRAY_SIZE(msgs) ? 0 : -EIO);



	if (ret)

		dev_err(&client->dev, "Error reading %d bytes from 0x%04x: %d\n",

			len, reg, ret);

	return ret;

}



/**
@@ -248,8 +254,15 @@ int goodix_i2c_write(struct i2c_client *client, u16 reg, const u8 *buf, int len) 
	msg.len = len + 2;



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

	if (ret >= 0)

		ret = (ret == 1 ? 0 : -EIO);



	kfree(addr_buf);

	return ret < 0 ? ret : (ret != 1 ? -EIO : 0);



	if (ret)

		dev_err(&client->dev, "Error writing %d bytes to 0x%04x: %d\n",

			len, reg, ret);

	return ret;

}



int goodix_i2c_write_u8(struct i2c_client *client, u16 reg, u8 value)
@@ -291,11 +304,8 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data) 
	do {

		error = goodix_i2c_read(ts->client, addr, data,

					header_contact_keycode_size);

		if (error) {

			dev_err(&ts->client->dev, "I2C transfer error: %d\n",

					error);

		if (error)

			return error;

		}



		if (data[0] & GOODIX_BUFFER_STATUS_READY) {

			touch_num = data[0] & 0x0f;
@@ -418,9 +428,7 @@ static irqreturn_t goodix_ts_irq_handler(int irq, void *dev_id) 
	struct goodix_ts_data *ts = dev_id;



	goodix_process_events(ts);



	if (goodix_i2c_write_u8(ts->client, GOODIX_READ_COOR_ADDR, 0) < 0)

		dev_err(&ts->client->dev, "I2C write end_cmd error\n");

	goodix_i2c_write_u8(ts->client, GOODIX_READ_COOR_ADDR, 0);



	return IRQ_HANDLED;

}
@@ -545,11 +553,9 @@ int goodix_send_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len) 
		return error;



	error = goodix_i2c_write(ts->client, ts->chip->config_addr, cfg, len);

	if (error) {

		dev_err(&ts->client->dev, "Failed to write config data: %d",

			error);

	if (error)

		return error;

	}



	dev_dbg(&ts->client->dev, "Config sent successfully.");



	/* Let the firmware reconfigure itself, so sleep for 10ms */
@@ -937,8 +943,6 @@ static void goodix_read_config(struct goodix_ts_data *ts) 
	error = goodix_i2c_read(ts->client, ts->chip->config_addr,

				ts->config, ts->chip->config_len);

	if (error) {

		dev_warn(&ts->client->dev, "Error reading config: %d\n",

			 error);

		ts->int_trigger_type = GOODIX_INT_TRIGGER;

		ts->max_touch_num = GOODIX_MAX_CONTACTS;

		return;
@@ -969,10 +973,8 @@ static int goodix_read_version(struct goodix_ts_data *ts) 
	char id_str[GOODIX_ID_MAX_LEN + 1];



	error = goodix_i2c_read(ts->client, GOODIX_REG_ID, buf, sizeof(buf));

	if (error) {

		dev_err(&ts->client->dev, "read version failed: %d\n", error);

	if (error)

		return error;

	}



	memcpy(id_str, buf, GOODIX_ID_MAX_LEN);

	id_str[GOODIX_ID_MAX_LEN] = 0;
@@ -998,13 +1000,10 @@ static int goodix_i2c_test(struct i2c_client *client) 
	u8 test;



	while (retry++ < 2) {

		error = goodix_i2c_read(client, GOODIX_REG_ID,

					&test, 1);

		error = goodix_i2c_read(client, GOODIX_REG_ID, &test, 1);

		if (!error)

			return 0;



		dev_err(&client->dev, "i2c test failed attempt %d: %d\n",

			retry, error);

		msleep(20);

	}
@@ -1232,10 +1231,8 @@ static int goodix_ts_probe(struct i2c_client *client, 
	}



	error = goodix_read_version(ts);

	if (error) {

		dev_err(&client->dev, "Read version failed.\n");

	if (error)

		return error;

	}



	ts->chip = goodix_get_chip_data(ts->id);
@@ -1306,7 +1303,6 @@ static int __maybe_unused goodix_suspend(struct device *dev) 
	error = goodix_i2c_write_u8(ts->client, GOODIX_REG_COMMAND,

				    GOODIX_CMD_SCREEN_OFF);

	if (error) {

		dev_err(&ts->client->dev, "Screen off command failed\n");

		goodix_irq_direction_input(ts);

		goodix_request_irq(ts);

		return -EAGAIN;
@@ -1349,10 +1345,7 @@ static int __maybe_unused goodix_resume(struct device *dev) 


	error = goodix_i2c_read(ts->client, ts->chip->config_addr,

				&config_ver, 1);

	if (error)

		dev_warn(dev, "Error reading config version: %d, resetting controller\n",

			 error);

	else if (config_ver != ts->config[0])

	if (!error && config_ver != ts->config[0])

		dev_info(dev, "Config version mismatch %d != %d, resetting controller\n",

			 config_ver, ts->config[0]);