diff mbox series

[v2,3/4] input: touchscreen: usbtouchscreen: Remove unused variable 'ret'

Message ID 20201126133607.3212484-4-lee.jones@linaro.org (mailing list archive)
State New
Headers show
Series Rid W=1 issues from Input | expand

Commit Message

Lee Jones Nov. 26, 2020, 1:36 p.m. UTC
Fixes the following W=1 kernel build warning(s):

 drivers/input/touchscreen/usbtouchscreen.c: In function ‘nexio_read_data’:
 drivers/input/touchscreen/usbtouchscreen.c:1052:50: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Henrik Rydberg <rydberg@bitmath.org>
Cc: James Hilliard <james.hilliard1@gmail.com>
Cc: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: linux-input@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/input/touchscreen/usbtouchscreen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Dmitry Torokhov Nov. 29, 2020, 2:59 a.m. UTC | #1
Hi Lee,

On Thu, Nov 26, 2020 at 01:36:06PM +0000, Lee Jones wrote:
> Fixes the following W=1 kernel build warning(s):
> 
>  drivers/input/touchscreen/usbtouchscreen.c: In function ‘nexio_read_data’:
>  drivers/input/touchscreen/usbtouchscreen.c:1052:50: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
> 
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Henrik Rydberg <rydberg@bitmath.org>
> Cc: James Hilliard <james.hilliard1@gmail.com>
> Cc: Daniel Ritz <daniel.ritz@gmx.ch>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/input/touchscreen/usbtouchscreen.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
> index 397cb1d3f481b..c3b7130cd9033 100644
> --- a/drivers/input/touchscreen/usbtouchscreen.c
> +++ b/drivers/input/touchscreen/usbtouchscreen.c
> @@ -1049,7 +1049,7 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
>  	unsigned int data_len = be16_to_cpu(packet->data_len);
>  	unsigned int x_len = be16_to_cpu(packet->x_len);
>  	unsigned int y_len = be16_to_cpu(packet->y_len);
> -	int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
> +	int x, y, begin_x, begin_y, end_x, end_y, w, h;
>  
>  	/* got touch data? */
>  	if ((pkt[0] & 0xe0) != 0xe0)
> @@ -1061,7 +1061,7 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
>  		x_len -= 0x80;
>  
>  	/* send ACK */
> -	ret = usb_submit_urb(priv->ack, GFP_ATOMIC);
> +	usb_submit_urb(priv->ack, GFP_ATOMIC);

I thought you were going to add error handling here?

>  
>  	if (!usbtouch->type->max_xc) {
>  		usbtouch->type->max_xc = 2 * x_len;
> -- 
> 2.25.1
> 

Thanks.
Lee Jones Nov. 29, 2020, 8:27 a.m. UTC | #2
On Sat, 28 Nov 2020, Dmitry Torokhov wrote:

> Hi Lee,
> 
> On Thu, Nov 26, 2020 at 01:36:06PM +0000, Lee Jones wrote:
> > Fixes the following W=1 kernel build warning(s):
> > 
> >  drivers/input/touchscreen/usbtouchscreen.c: In function ‘nexio_read_data’:
> >  drivers/input/touchscreen/usbtouchscreen.c:1052:50: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
> > 
> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > Cc: Henrik Rydberg <rydberg@bitmath.org>
> > Cc: James Hilliard <james.hilliard1@gmail.com>
> > Cc: Daniel Ritz <daniel.ritz@gmx.ch>
> > Cc: linux-input@vger.kernel.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >  drivers/input/touchscreen/usbtouchscreen.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
> > index 397cb1d3f481b..c3b7130cd9033 100644
> > --- a/drivers/input/touchscreen/usbtouchscreen.c
> > +++ b/drivers/input/touchscreen/usbtouchscreen.c
> > @@ -1049,7 +1049,7 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
> >  	unsigned int data_len = be16_to_cpu(packet->data_len);
> >  	unsigned int x_len = be16_to_cpu(packet->x_len);
> >  	unsigned int y_len = be16_to_cpu(packet->y_len);
> > -	int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
> > +	int x, y, begin_x, begin_y, end_x, end_y, w, h;
> >  
> >  	/* got touch data? */
> >  	if ((pkt[0] & 0xe0) != 0xe0)
> > @@ -1061,7 +1061,7 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
> >  		x_len -= 0x80;
> >  
> >  	/* send ACK */
> > -	ret = usb_submit_urb(priv->ack, GFP_ATOMIC);
> > +	usb_submit_urb(priv->ack, GFP_ATOMIC);
> 
> I thought you were going to add error handling here?

Hmm... I thought I handed all of the review comments!

Will look into this again on Monday.

> >  	if (!usbtouch->type->max_xc) {
> >  		usbtouch->type->max_xc = 2 * x_len;
> 
> Thanks.
>
diff mbox series

Patch

diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 397cb1d3f481b..c3b7130cd9033 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -1049,7 +1049,7 @@  static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
 	unsigned int data_len = be16_to_cpu(packet->data_len);
 	unsigned int x_len = be16_to_cpu(packet->x_len);
 	unsigned int y_len = be16_to_cpu(packet->y_len);
-	int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
+	int x, y, begin_x, begin_y, end_x, end_y, w, h;
 
 	/* got touch data? */
 	if ((pkt[0] & 0xe0) != 0xe0)
@@ -1061,7 +1061,7 @@  static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
 		x_len -= 0x80;
 
 	/* send ACK */
-	ret = usb_submit_urb(priv->ack, GFP_ATOMIC);
+	usb_submit_urb(priv->ack, GFP_ATOMIC);
 
 	if (!usbtouch->type->max_xc) {
 		usbtouch->type->max_xc = 2 * x_len;