linux-kernel - Re: [PATCH] Removed useless retval variables in usb-serial.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4A69E164.9040403@ru.mvista.com>
Date:	Fri, 24 Jul 2009 20:29:24 +0400
From:	Sergei Shtylyov <sshtylyov@...mvista.com>
To:	Trevor Pace <tr212206@....CA>
Cc:	gregkh@...e.de, linux-usb@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Removed useless retval variables in usb-serial.c

Hello.

Trevor Pace wrote:

> Removed useless return value variables.

    Are you sure gcc doesn't optimize them away? :-)

> Signed-off By: Trevor Pace <trevor.pace@....ca>

> ================================================================================

> diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
> index bd7581b..faec1d1 100644
> --- a/drivers/usb/serial/usb-serial.c
> +++ b/drivers/usb/serial/usb-serial.c

[...]

> @@ -437,11 +432,9 @@ static int serial_ioctl(struct tty_struct *tty, struct file
> *file,
> 
>  	/* pass on to the driver specific version of this function
>  	   if it is available */
> -	if (port->serial->type->ioctl) {
> -		retval = port->serial->type->ioctl(tty, file, cmd, arg);
> -	} else
> -		retval = -ENOIOCTLCMD;
> -	return retval;
> +	if (port->serial->type->ioctl)
> +		return port->serial->type->ioctl(tty, file, cmd, arg);
> +        return -ENOIOCTLCMD;

    Spaces instead of tab here...

> @@ -1185,24 +1178,21 @@ int usb_serial_suspend(struct usb_interface *intf,
> pm_message_t message)
>  	}
> 
>  	if (serial->type->suspend)
> -		r = serial->type->suspend(serial, message);
> +		return serial->type->suspend(serial, message);
> 
> -	return r;
> +	return 0;
>  }
>  EXPORT_SYMBOL(usb_serial_suspend);
> 
>  int usb_serial_resume(struct usb_interface *intf)
>  {
>  	struct usb_serial *serial = usb_get_intfdata(intf);
> -	int rv;
> 
>  	serial->suspending = 0;
> -	if (serial->type->resume)
> -		rv = serial->type->resume(serial);
> -	else
> -		rv = usb_serial_generic_resume(serial);
> 
> -	return rv;
> +	return (serial->type->resume)

    Parens totally not needed here.

> +		? serial->type->resume(serial)
> +		: usb_serial_generic_resume(serial);
>  }
>  EXPORT_SYMBOL(usb_serial_resume);

WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/