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

Commit 546ae108 authored by Andrew Duggan's avatar Andrew Duggan Committed by Dmitry Torokhov
Browse files

Input: synaptics-rmi4 - remove unneeded variable 



Remove the data_base_addr_offset variable in rmi_f11_attention(). The
f11 data is read as a single block so there is no need to store an offset
to the data address.

Signed-off-by: default avatarAndrew Duggan <aduggan@synaptics.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarNick Dyer <nick@shmanahar.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e2158295

drivers/input/rmi4/rmi_f11.c

+1 −4
Original line number Diff line number Diff line
@@ -1241,7 +1241,6 @@ static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits) 
	struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);

	struct f11_data *f11 = dev_get_drvdata(&fn->dev);

	u16 data_base_addr = fn->fd.data_base_addr;

	u16 data_base_addr_offset = 0;

	int error;



	if (rmi_dev->xport->attn_data) {
@@ -1251,8 +1250,7 @@ static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits) 
		rmi_dev->xport->attn_size -= f11->sensor.attn_size;

	} else {

		error = rmi_read_block(rmi_dev,

				data_base_addr + data_base_addr_offset,

				f11->sensor.data_pkt,

				data_base_addr, f11->sensor.data_pkt,

				f11->sensor.pkt_size);

		if (error < 0)

			return error;
@@ -1260,7 +1258,6 @@ static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits) 


	rmi_f11_finger_handler(f11, &f11->sensor, irq_bits,

				drvdata->num_of_irq_regs);

	data_base_addr_offset += f11->sensor.pkt_size;



	return 0;

}