[PATCH] USB: serial: iuu_phoenix: remove redundant variable 'error'

[PATCH] USB: serial: iuu_phoenix: remove redundant variable 'error'

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

The variable error is initialized to 0 and is set to 1 this
value is never read as it is on an immediate return path. The
only read of error is to check it is 0 and this check is always
true at that point of the code. The variable is redundant and
can be removed.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/usb/serial/iuu_phoenix.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 093afd67a664..19753611e7b0 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -643,7 +643,6 @@ static void iuu_uart_read_callback(struct urb *urb)
 	struct iuu_private *priv = usb_get_serial_port_data(port);
 	unsigned long flags;
 	int status = urb->status;
-	int error = 0;
 	int len = 0;
 	unsigned char *data = urb->transfer_buffer;
 	priv->poll++;
@@ -660,12 +659,11 @@ static void iuu_uart_read_callback(struct urb *urb)
 	if (urb->actual_length > 1) {
 		dev_dbg(&port->dev, "%s - urb->actual_length = %i\n", __func__,
 		    urb->actual_length);
-		error = 1;
 		return;
 	}
 	/* if len > 0 call readbuf */
 
-	if (len > 0 && error == 0) {
+	if (len > 0) {
 		dev_dbg(&port->dev, "%s - call read buf - len to read is %i\n",
 			__func__, len);
 		status = iuu_read_buf(port, len);
-- 
2.30.2

Re: [PATCH] USB: serial: iuu_phoenix: remove redundant variable 'error'

[Johan Hovold]

On Sat, Mar 27, 2021 at 11:27:44PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The variable error is initialized to 0 and is set to 1 this
> value is never read as it is on an immediate return path. The
> only read of error is to check it is 0 and this check is always
> true at that point of the code. The variable is redundant and
> can be removed.
> 
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/usb/serial/iuu_phoenix.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
> index 093afd67a664..19753611e7b0 100644
> --- a/drivers/usb/serial/iuu_phoenix.c
> +++ b/drivers/usb/serial/iuu_phoenix.c
> @@ -643,7 +643,6 @@ static void iuu_uart_read_callback(struct urb *urb)
>  	struct iuu_private *priv = usb_get_serial_port_data(port);
>  	unsigned long flags;
>  	int status = urb->status;
> -	int error = 0;
>  	int len = 0;
>  	unsigned char *data = urb->transfer_buffer;
>  	priv->poll++;
> @@ -660,12 +659,11 @@ static void iuu_uart_read_callback(struct urb *urb)
>  	if (urb->actual_length > 1) {
>  		dev_dbg(&port->dev, "%s - urb->actual_length = %i\n", __func__,
>  		    urb->actual_length);
> -		error = 1;
>  		return;

Heh, I guess the author at some point intended not return here, but who
knows. The rest of this function is about as esoteric.

>  	}
>  	/* if len > 0 call readbuf */
>  
> -	if (len > 0 && error == 0) {
> +	if (len > 0) {
>  		dev_dbg(&port->dev, "%s - call read buf - len to read is %i\n",
>  			__func__, len);
>  		status = iuu_read_buf(port, len);

Now applied, thanks.

Johan