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

Commit 5833041f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: serial: remove unnecessary reinitialisations of urb->dev 



Remove unnecessary reinitialisations of urb->dev before each submission,
which were based on the (no longer valid) assumption that serial->dev
will be set to NULL on close.

Compile-only tested.

Cc: Matthias Bruestle and Harald Welte <support@reiner-sct.com>
Cc: Lonnie Mendez <dignome@gmail.com>
Cc: Peter Berger <pberger@brimson.com>
Cc: Al Borchers <alborchers@steinerpoint.com>
Cc: Support Department <support@connecttech.com>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 016af7ec

drivers/usb/serial/ch341.c

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) 
		goto out;



	dbg("%s - submitting interrupt urb", __func__);

	port->interrupt_in_urb->dev = serial->dev;

	r = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);

	if (r) {

		dev_err(&port->dev, "%s - failed submitting interrupt urb,"

drivers/usb/serial/cyberjack.c

+0 −4
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ static int cyberjack_startup(struct usb_serial *serial) 


	for (i = 0; i < serial->num_ports; ++i) {

		int result;

		serial->port[i]->interrupt_in_urb->dev = serial->dev;

		result = usb_submit_urb(serial->port[i]->interrupt_in_urb,

					GFP_KERNEL);

		if (result)
@@ -347,7 +346,6 @@ static void cyberjack_read_int_callback(struct urb *urb) 
		spin_unlock(&priv->lock);



		if (!old_rdtodo) {

			port->read_urb->dev = port->serial->dev;

			result = usb_submit_urb(port->read_urb, GFP_ATOMIC);

			if (result)

				dev_err(&port->dev, "%s - failed resubmitting "
@@ -358,7 +356,6 @@ static void cyberjack_read_int_callback(struct urb *urb) 
	}



resubmit:

	port->interrupt_in_urb->dev = port->serial->dev;

	result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);

	if (result)

		dev_err(&port->dev, "usb_submit_urb(read int) failed\n");
@@ -411,7 +408,6 @@ static void cyberjack_read_bulk_callback(struct urb *urb) 


	/* Continue to read if we have still urbs to do. */

	if (todo /* || (urb->actual_length==port->bulk_in_endpointAddress)*/) {

		port->read_urb->dev = port->serial->dev;

		result = usb_submit_urb(port->read_urb, GFP_ATOMIC);

		if (result)

			dev_err(&port->dev, "%s - failed resubmitting read "

drivers/usb/serial/cypress_m8.c

+0 −3
Original line number Diff line number Diff line
@@ -1136,8 +1136,6 @@ static void cypress_unthrottle(struct tty_struct *tty) 
		return;



	if (actually_throttled) {

		port->interrupt_in_urb->dev = port->serial->dev;



		result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);

		if (result) {

			dev_err(&port->dev, "%s - failed submitting read urb, "
@@ -1326,7 +1324,6 @@ static void cypress_write_int_callback(struct urb *urb) 
		dbg("%s - nonzero write bulk status received: %d",

			__func__, status);

		port->interrupt_out_urb->transfer_buffer_length = 1;

		port->interrupt_out_urb->dev = port->serial->dev;

		result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC);

		if (!result)

			return;

drivers/usb/serial/digi_acceleport.c

+1 −10
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ static int digi_write_oob_command(struct usb_serial_port *port, 
			len &= ~3;

		memcpy(oob_port->write_urb->transfer_buffer, buf, len);

		oob_port->write_urb->transfer_buffer_length = len;

		oob_port->write_urb->dev = port->serial->dev;

		ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC);

		if (ret == 0) {

			oob_priv->dp_write_urb_in_use = 1;
@@ -516,7 +515,6 @@ static int digi_write_inb_command(struct usb_serial_port *port, 
			memcpy(data, buf, len);

			port->write_urb->transfer_buffer_length = len;

		}

		port->write_urb->dev = port->serial->dev;



		ret = usb_submit_urb(port->write_urb, GFP_ATOMIC);

		if (ret == 0) {
@@ -587,7 +585,6 @@ static int digi_set_modem_signals(struct usb_serial_port *port, 
	data[7] = 0;



	oob_port->write_urb->transfer_buffer_length = 8;

	oob_port->write_urb->dev = port->serial->dev;



	ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC);

	if (ret == 0) {
@@ -683,10 +680,8 @@ static void digi_rx_unthrottle(struct tty_struct *tty) 
	spin_lock_irqsave(&priv->dp_port_lock, flags);



	/* restart read chain */

	if (priv->dp_throttle_restart) {

		port->read_urb->dev = port->serial->dev;

	if (priv->dp_throttle_restart)

		ret = usb_submit_urb(port->read_urb, GFP_ATOMIC);

	}



	/* turn throttle off */

	priv->dp_throttled = 0;
@@ -979,7 +974,6 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port, 
	}



	port->write_urb->transfer_buffer_length = data_len+2;

	port->write_urb->dev = port->serial->dev;



	*data++ = DIGI_CMD_SEND_DATA;

	*data++ = data_len;
@@ -1055,7 +1049,6 @@ static void digi_write_bulk_callback(struct urb *urb) 
			= (unsigned char)priv->dp_out_buf_len;

		port->write_urb->transfer_buffer_length =

						priv->dp_out_buf_len + 2;

		port->write_urb->dev = serial->dev;

		memcpy(port->write_urb->transfer_buffer + 2, priv->dp_out_buf,

			priv->dp_out_buf_len);

		ret = usb_submit_urb(port->write_urb, GFP_ATOMIC);
@@ -1257,7 +1250,6 @@ static int digi_startup_device(struct usb_serial *serial) 
	/* set USB_DISABLE_SPD flag for write bulk urbs */

	for (i = 0; i < serial->type->num_ports + 1; i++) {

		port = serial->port[i];

		port->write_urb->dev = port->serial->dev;

		ret = usb_submit_urb(port->read_urb, GFP_KERNEL);

		if (ret != 0) {

			dev_err(&port->dev,
@@ -1400,7 +1392,6 @@ static void digi_read_bulk_callback(struct urb *urb) 
	}



	/* continue read */

	urb->dev = port->serial->dev;

	ret = usb_submit_urb(urb, GFP_ATOMIC);

	if (ret != 0 && ret != -EPERM) {

		dev_err(&port->dev,

drivers/usb/serial/garmin_gps.c

+0 −2
Original line number Diff line number Diff line
@@ -901,7 +901,6 @@ static int garmin_init_session(struct usb_serial_port *port) 
		usb_kill_urb(port->interrupt_in_urb);



		dbg("%s - adding interrupt input", __func__);

		port->interrupt_in_urb->dev = serial->dev;

		status = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);

		if (status)

			dev_err(&serial->dev->dev,
@@ -1353,7 +1352,6 @@ static void garmin_read_int_callback(struct urb *urb) 


	garmin_read_process(garmin_data_p, data, urb->actual_length, 0);



	port->interrupt_in_urb->dev = port->serial->dev;

	retval = usb_submit_urb(urb, GFP_ATOMIC);

	if (retval)

		dev_err(&urb->dev->dev,