Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fd11961a2deaf4220ca90ce734439b4006db2911

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent b7195188e9
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

USB: serial: remove unnecessary bulk-urb re-fills 

Remove unnecessary re-fills of bulk urbs whose fields have not changed
since port probe.

Compile-only tested.

Cc: Matthias Bruestle and Harald Welte <support@reiner-sct.com>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 4 changed files with 3 additions and 40 deletions Side-by-side Diff

drivers/usb/serial/cyberjack.c
Diff comments   View file @ fd11961
... ... @@ -207,7 +207,6 @@
207 207 static int cyberjack_write(struct tty_struct *tty,
208 208 struct usb_serial_port *port, const unsigned char *buf, int count)
209 209 {
210   - struct usb_serial *serial = port->serial;
211 210 struct cyberjack_private *priv = usb_get_serial_port_data(port);
212 211 unsigned long flags;
213 212 int result;
... ... @@ -260,13 +259,7 @@
260 259 priv->wrsent = length;
261 260  
262 261 /* set up our urb */
263   - usb_fill_bulk_urb(port->write_urb, serial->dev,
264   - usb_sndbulkpipe(serial->dev, port->bulk_out_endpointAddress),
265   - port->write_urb->transfer_buffer, length,
266   - ((serial->type->write_bulk_callback) ?
267   - serial->type->write_bulk_callback :
268   - cyberjack_write_bulk_callback),
269   - port);
  262 + port->write_urb->transfer_buffer_length = length;
270 263  
271 264 /* send the data out the bulk port */
272 265 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
... ... @@ -447,13 +440,7 @@
447 440 priv->wrsent += length;
448 441  
449 442 /* set up our urb */
450   - usb_fill_bulk_urb(port->write_urb, port->serial->dev,
451   - usb_sndbulkpipe(port->serial->dev, port->bulk_out_endpointAddress),
452   - port->write_urb->transfer_buffer, length,
453   - ((port->serial->type->write_bulk_callback) ?
454   - port->serial->type->write_bulk_callback :
455   - cyberjack_write_bulk_callback),
456   - port);
  443 + port->write_urb->transfer_buffer_length = length;
457 444  
458 445 /* send the data out the bulk port */
459 446 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
drivers/usb/serial/garmin_gps.c
Diff comments   View file @ fd11961
... ... @@ -1276,7 +1276,6 @@
1276 1276 unsigned long flags;
1277 1277 int retval;
1278 1278 struct usb_serial_port *port = urb->context;
1279   - struct usb_serial *serial = port->serial;
1280 1279 struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
1281 1280 unsigned char *data = urb->transfer_buffer;
1282 1281 int status = urb->status;
... ... @@ -1310,12 +1309,6 @@
1310 1309 if (0 == (garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE)) {
1311 1310  
1312 1311 /* bulk data available */
1313   - usb_fill_bulk_urb(port->read_urb, serial->dev,
1314   - usb_rcvbulkpipe(serial->dev,
1315   - port->bulk_in_endpointAddress),
1316   - port->read_urb->transfer_buffer,
1317   - port->read_urb->transfer_buffer_length,
1318   - garmin_read_bulk_callback, port);
1319 1312 retval = usb_submit_urb(port->read_urb, GFP_ATOMIC);
1320 1313 if (retval) {
1321 1314 dev_err(&port->dev,
drivers/usb/serial/io_ti.c
Diff comments   View file @ fd11961
... ... @@ -2106,12 +2106,7 @@
2106 2106 port->write_urb->transfer_buffer);
2107 2107  
2108 2108 /* set up our urb */
2109   - usb_fill_bulk_urb(port->write_urb, port->serial->dev,
2110   - usb_sndbulkpipe(port->serial->dev,
2111   - port->bulk_out_endpointAddress),
2112   - port->write_urb->transfer_buffer, count,
2113   - edge_bulk_out_callback,
2114   - port);
  2109 + port->write_urb->transfer_buffer_length = count;
2115 2110  
2116 2111 /* send the data out the bulk port */
2117 2112 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
drivers/usb/serial/omninet.c
Diff comments   View file @ fd11961
... ... @@ -148,13 +148,6 @@
148 148 tty_port_tty_set(&wport->port, tty);
149 149  
150 150 /* Start reading from the device */
151   - usb_fill_bulk_urb(port->read_urb, serial->dev,
152   - usb_rcvbulkpipe(serial->dev,
153   - port->bulk_in_endpointAddress),
154   - port->read_urb->transfer_buffer,
155   - port->read_urb->transfer_buffer_length,
156   - omninet_read_bulk_callback, port);
157   -
158 151 result = usb_submit_urb(port->read_urb, GFP_KERNEL);
159 152 if (result)
160 153 dev_err(&port->dev,
... ... @@ -211,11 +204,6 @@
211 204 }
212 205  
213 206 /* Continue trying to always read */
214   - usb_fill_bulk_urb(urb, port->serial->dev,
215   - usb_rcvbulkpipe(port->serial->dev,
216   - port->bulk_in_endpointAddress),
217   - urb->transfer_buffer, urb->transfer_buffer_length,
218   - omninet_read_bulk_callback, port);
219 207 result = usb_submit_urb(urb, GFP_ATOMIC);
220 208 if (result)
221 209 dev_err(&port->dev,