Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45a1e07 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

USB: serial: Eliminate useless code 

The variables priv and portdata are initialized twice to the same (side
effect-free) expressions.  Drop one initialization in each case.

A simplified version of the semantic match that finds this problem is:
(http://coccinelle.lip6.fr/

)

// <smpl>
@forall@
idexpression *x;
identifier f!=ERR_PTR;
@@

x = f(...)
... when != x
(
x = f(...,<+...x...+>,...)
|
* x = f(...)
)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aa790740

drivers/usb/serial/cypress_m8.c

+0 −1
Original line number Diff line number Diff line
@@ -691,7 +691,6 @@ static void cypress_dtr_rts(struct usb_serial_port *port, int on) 
{

	struct cypress_private *priv = usb_get_serial_port_data(port);

	/* drop dtr and rts */

	priv = usb_get_serial_port_data(port);

	spin_lock_irq(&priv->lock);

	if (on == 0)

		priv->line_control = 0;

drivers/usb/serial/sierra.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static void sierra_outdat_callback(struct urb *urb) 
static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port,

					const unsigned char *buf, int count)

{

	struct sierra_port_private *portdata = usb_get_serial_port_data(port);

	struct sierra_port_private *portdata;

	struct sierra_intf_private *intfdata;

	struct usb_serial *serial = port->serial;

	unsigned long flags;