linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 6/8] Input: synaptics-rmi4: Remove unneeded variable
@ 2016-06-25  0:19 Andrew Duggan
  2016-07-05 10:18 ` Nick Dyer
  0 siblings, 1 reply; 2+ messages in thread
From: Andrew Duggan @ 2016-06-25  0:19 UTC (permalink / raw)
  To: linux-input, linux-kernel
  Cc: Andrew Duggan, Dmitry Torokhov, Linus Walleij, Jiri Kosina,
	Benjamin Tissoires, Vincent Huang, Nick Dyer

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>
---
 drivers/input/rmi4/rmi_f11.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index e691432..688e604 100644
--- a/drivers/input/rmi4/rmi_f11.c
+++ b/drivers/input/rmi4/rmi_f11.c
@@ -1265,7 +1265,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) {
@@ -1275,8 +1274,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;
@@ -1284,7 +1282,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;
 }
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2 6/8] Input: synaptics-rmi4: Remove unneeded variable
  2016-06-25  0:19 [PATCH v2 6/8] Input: synaptics-rmi4: Remove unneeded variable Andrew Duggan
@ 2016-07-05 10:18 ` Nick Dyer
  0 siblings, 0 replies; 2+ messages in thread
From: Nick Dyer @ 2016-07-05 10:18 UTC (permalink / raw)
  To: Andrew Duggan, linux-input, linux-kernel
  Cc: Dmitry Torokhov, Linus Walleij, Jiri Kosina, Benjamin Tissoires,
	Vincent Huang



On 25/06/2016 01:19, Andrew Duggan wrote:
> 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: Nick Dyer <nick@shmanahar.org>

> ---
>  drivers/input/rmi4/rmi_f11.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
> index e691432..688e604 100644
> --- a/drivers/input/rmi4/rmi_f11.c
> +++ b/drivers/input/rmi4/rmi_f11.c
> @@ -1265,7 +1265,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) {
> @@ -1275,8 +1274,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;
> @@ -1284,7 +1282,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;
>  }
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-07-05 10:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-25  0:19 [PATCH v2 6/8] Input: synaptics-rmi4: Remove unneeded variable Andrew Duggan
2016-07-05 10:18 ` Nick Dyer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).