diff mbox series

[07/15] input: touchscreen: usbtouchscreen: Remove unused variable 'ret'

Message ID 20201112110204.2083435-8-lee.jones@linaro.org
State Superseded
Headers show
Series Rid W=1 issues from Input | expand

Commit Message

Lee Jones Nov. 12, 2020, 11:01 a.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(-)

-- 
2.25.1

Comments

Dmitry Torokhov Nov. 13, 2020, 7:36 a.m. UTC | #1 
On Thu, Nov 12, 2020 at 11:01:56AM +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 wonder if we should handle potential errors instead.

>  

>  	if (!usbtouch->type->max_xc) {

>  		usbtouch->type->max_xc = 2 * x_len;

> -- 

> 2.25.1

> 


Thanks.

-- 
Dmitry
Lee Jones Nov. 13, 2020, 7:56 a.m. UTC | #2 
On Thu, 12 Nov 2020, Dmitry Torokhov wrote:

> On Thu, Nov 12, 2020 at 11:01:56AM +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 wonder if we should handle potential errors instead.


Your call.  I'll do whatever you decide.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Dmitry Torokhov Nov. 20, 2020, 3:09 a.m. UTC | #3 
On Fri, Nov 13, 2020 at 07:56:31AM +0000, Lee Jones wrote:
> On Thu, 12 Nov 2020, Dmitry Torokhov wrote:

> 

> > On Thu, Nov 12, 2020 at 11:01:56AM +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 wonder if we should handle potential errors instead.

> 

> Your call.  I'll do whatever you decide.


OK, please add error handling here.

Thank you.

-- 
Dmitry
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;