aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/rmi4
diff options
context:
space:
mode:
authorAndrew Duggan <aduggan@synaptics.com>2016-07-14 12:38:04 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-14 12:43:43 -0400
commit546ae1085b2772de47221c8780c000ee9829545d (patch)
tree4a9ebac31dcb22f7ea50b545e0bea1b174f506c4 /drivers/input/rmi4
parente21582956005bb1677b0c2f9caf1042020f45408 (diff)
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: Andrew Duggan <aduggan@synaptics.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Reviewed-by: Nick Dyer <nick@shmanahar.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/rmi4')
-rw-r--r--drivers/input/rmi4/rmi_f11.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index ec8a10d53288..c3672b983fc9 100644
--- a/drivers/input/rmi4/rmi_f11.c
+++ b/drivers/input/rmi4/rmi_f11.c
@@ -1241,7 +1241,6 @@ static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits)
1241 struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev); 1241 struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
1242 struct f11_data *f11 = dev_get_drvdata(&fn->dev); 1242 struct f11_data *f11 = dev_get_drvdata(&fn->dev);
1243 u16 data_base_addr = fn->fd.data_base_addr; 1243 u16 data_base_addr = fn->fd.data_base_addr;
1244 u16 data_base_addr_offset = 0;
1245 int error; 1244 int error;
1246 1245
1247 if (rmi_dev->xport->attn_data) { 1246 if (rmi_dev->xport->attn_data) {
@@ -1251,8 +1250,7 @@ static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits)
1251 rmi_dev->xport->attn_size -= f11->sensor.attn_size; 1250 rmi_dev->xport->attn_size -= f11->sensor.attn_size;
1252 } else { 1251 } else {
1253 error = rmi_read_block(rmi_dev, 1252 error = rmi_read_block(rmi_dev,
1254 data_base_addr + data_base_addr_offset, 1253 data_base_addr, f11->sensor.data_pkt,
1255 f11->sensor.data_pkt,
1256 f11->sensor.pkt_size); 1254 f11->sensor.pkt_size);
1257 if (error < 0) 1255 if (error < 0)
1258 return error; 1256 return error;
@@ -1260,7 +1258,6 @@ static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits)
1260 1258
1261 rmi_f11_finger_handler(f11, &f11->sensor, irq_bits, 1259 rmi_f11_finger_handler(f11, &f11->sensor, irq_bits,
1262 drvdata->num_of_irq_regs); 1260 drvdata->num_of_irq_regs);
1263 data_base_addr_offset += f11->sensor.pkt_size;
1264 1261
1265 return 0; 1262 return 0;
1266} 1263}