Commit d843304b authored by Lucas Stach's avatar Lucas Stach Committed by Dmitry Torokhov
Browse files

Input: synaptics-rmi4 - simplify data read in rmi_f54_work 



The body of the for loop is only ever run once as the second standard_report
element is never changed from its initial zero init, so the loop condition is
never satisfies after the first run. Equally the start member of the first
element is never changed from 0, so the index offset is always a constant 0.

Remove this needless obfuscation of the code and write it in a straight
forward manner.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Link: https://lore.kernel.org/r/20191104114454.10500-3-l.stach@pengutronix.de


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

drivers/input/rmi4/rmi_f54.c

+16 −32
Original line number Original line Diff line number Diff line
@@ -81,11 +81,6 @@ static const char * const rmi_f54_report_type_names[] = { 
					= "Full Raw Capacitance RX Offset Removed",

					= "Full Raw Capacitance RX Offset Removed",

};

};





struct rmi_f54_reports {

	int start;

	int size;

};



struct f54_data {

struct f54_data {

	struct rmi_function *fn;

	struct rmi_function *fn;
@@ -98,7 +93,6 @@ struct f54_data { 
	enum rmi_f54_report_type report_type;

	enum rmi_f54_report_type report_type;

	u8 *report_data;

	u8 *report_data;

	int report_size;

	int report_size;

	struct rmi_f54_reports standard_report[2];





	bool is_busy;

	bool is_busy;

	struct mutex status_mutex;

	struct mutex status_mutex;
@@ -516,13 +510,10 @@ static void rmi_f54_work(struct work_struct *work) 
	struct f54_data *f54 = container_of(work, struct f54_data, work.work);

	struct f54_data *f54 = container_of(work, struct f54_data, work.work);

	struct rmi_function *fn = f54->fn;

	struct rmi_function *fn = f54->fn;

	u8 fifo[2];

	u8 fifo[2];

	struct rmi_f54_reports *report;

	int report_size;

	int report_size;

	u8 command;

	u8 command;

	u8 *data;

	int error;

	int error;





	data = f54->report_data;

	report_size = rmi_f54_get_report_size(f54);

	report_size = rmi_f54_get_report_size(f54);

	if (report_size == 0) {

	if (report_size == 0) {

		dev_err(&fn->dev, "Bad report size, report type=%d\n",

		dev_err(&fn->dev, "Bad report size, report type=%d\n",
@@ -530,8 +521,6 @@ static void rmi_f54_work(struct work_struct *work) 
		error = -EINVAL;

		error = -EINVAL;

		goto error;     /* retry won't help */

		goto error;     /* retry won't help */

	}

	}

	f54->standard_report[0].size = report_size;

	report = f54->standard_report;





	mutex_lock(&f54->data_mutex);

	mutex_lock(&f54->data_mutex);
@@ -556,10 +545,8 @@ static void rmi_f54_work(struct work_struct *work) 




	rmi_dbg(RMI_DEBUG_FN, &fn->dev, "Get report command completed, reading data\n");

	rmi_dbg(RMI_DEBUG_FN, &fn->dev, "Get report command completed, reading data\n");





	report_size = 0;

	fifo[0] = 0;

	for (; report->size; report++) {

	fifo[1] = 0;

		fifo[0] = report->start & 0xff;

		fifo[1] = (report->start >> 8) & 0xff;

	error = rmi_write_block(fn->rmi_dev,

	error = rmi_write_block(fn->rmi_dev,

				fn->fd.data_base_addr + F54_FIFO_OFFSET,

				fn->fd.data_base_addr + F54_FIFO_OFFSET,

				fifo, sizeof(fifo));

				fifo, sizeof(fifo));
@@ -569,16 +556,13 @@ static void rmi_f54_work(struct work_struct *work) 
	}

	}





	error = rmi_read_block(fn->rmi_dev, fn->fd.data_base_addr +

	error = rmi_read_block(fn->rmi_dev, fn->fd.data_base_addr +

				       F54_REPORT_DATA_OFFSET, data,

			       F54_REPORT_DATA_OFFSET, f54->report_data,

				       report->size);

			       report_size);

	if (error) {

	if (error) {

		dev_err(&fn->dev, "%s: read [%d bytes] returned %d\n",

		dev_err(&fn->dev, "%s: read [%d bytes] returned %d\n",

				__func__, report->size, error);

			__func__, report_size, error);

		goto abort;

		goto abort;

	}

	}

		data += report->size;

		report_size += report->size;

	}





abort:

abort:

	f54->report_size = error ? 0 : report_size;

	f54->report_size = error ? 0 : report_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE