Skip to content

Commit fd11961

Browse files
jhovoldgregkh
authored andcommitted
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 <[email protected]> Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b719518 commit fd11961

File tree

4 files changed

+3
-40
lines changed

4 files changed

+3
-40
lines changed

drivers/usb/serial/cyberjack.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ static void cyberjack_close(struct usb_serial_port *port)
207207
static int cyberjack_write(struct tty_struct *tty,
208208
struct usb_serial_port *port, const unsigned char *buf, int count)
209209
{
210-
struct usb_serial *serial = port->serial;
211210
struct cyberjack_private *priv = usb_get_serial_port_data(port);
212211
unsigned long flags;
213212
int result;
@@ -260,13 +259,7 @@ static int cyberjack_write(struct tty_struct *tty,
260259
priv->wrsent = length;
261260

262261
/* 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;
270263

271264
/* send the data out the bulk port */
272265
result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
@@ -447,13 +440,7 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
447440
priv->wrsent += length;
448441

449442
/* 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;
457444

458445
/* send the data out the bulk port */
459446
result = usb_submit_urb(port->write_urb, GFP_ATOMIC);

drivers/usb/serial/garmin_gps.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,6 @@ static void garmin_read_int_callback(struct urb *urb)
12761276
unsigned long flags;
12771277
int retval;
12781278
struct usb_serial_port *port = urb->context;
1279-
struct usb_serial *serial = port->serial;
12801279
struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
12811280
unsigned char *data = urb->transfer_buffer;
12821281
int status = urb->status;
@@ -1310,12 +1309,6 @@ static void garmin_read_int_callback(struct urb *urb)
13101309
if (0 == (garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE)) {
13111310

13121311
/* 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);
13191312
retval = usb_submit_urb(port->read_urb, GFP_ATOMIC);
13201313
if (retval) {
13211314
dev_err(&port->dev,

drivers/usb/serial/io_ti.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,12 +2106,7 @@ static void edge_send(struct tty_struct *tty)
21062106
port->write_urb->transfer_buffer);
21072107

21082108
/* 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;
21152110

21162111
/* send the data out the bulk port */
21172112
result = usb_submit_urb(port->write_urb, GFP_ATOMIC);

drivers/usb/serial/omninet.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,6 @@ static int omninet_open(struct tty_struct *tty, struct usb_serial_port *port)
148148
tty_port_tty_set(&wport->port, tty);
149149

150150
/* 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-
158151
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
159152
if (result)
160153
dev_err(&port->dev,
@@ -211,11 +204,6 @@ static void omninet_read_bulk_callback(struct urb *urb)
211204
}
212205

213206
/* 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);
219207
result = usb_submit_urb(urb, GFP_ATOMIC);
220208
if (result)
221209
dev_err(&port->dev,

0 commit comments

Comments
 (0)