diff options
| author | Johan Hovold <jhovold@gmail.com> | 2010-03-17 23:05:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 13:21:33 -0700 |
| commit | 056afc0f01701c4c779ac5b4f2dd9058063f337c (patch) | |
| tree | 9700b245fd8ce0cb0720c160d18fc87a0260801c /drivers/usb/serial | |
| parent | 41bd72f9041def8e3334d3e3693862d078f5cb9a (diff) | |
| download | op-kernel-dev-056afc0f01701c4c779ac5b4f2dd9058063f337c.zip op-kernel-dev-056afc0f01701c4c779ac5b4f2dd9058063f337c.tar.gz | |
USB: serial: remove unnecessary re-initialisation of generic urbs
The generic read and write bulk urbs are initialised when allocated in
usb_serial_probe. The only field that needs to be updated after that is
the transfer_buffer_length of the write urb.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/generic.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index d8dd3a5..ffc2f16 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -256,7 +256,6 @@ error_no_buffer: */ static int usb_serial_generic_write_start(struct usb_serial_port *port) { - struct usb_serial *serial = port->serial; unsigned char *data; int result; int count; @@ -281,15 +280,7 @@ static int usb_serial_generic_write_start(struct usb_serial_port *port) count = kfifo_out_locked(&port->write_fifo, data, port->bulk_out_size, &port->lock); usb_serial_debug_data(debug, &port->dev, __func__, count, data); - /* set up our urb */ - usb_fill_bulk_urb(port->write_urb, serial->dev, - usb_sndbulkpipe(serial->dev, - port->bulk_out_endpointAddress), - port->write_urb->transfer_buffer, count, - ((serial->type->write_bulk_callback) ? - serial->type->write_bulk_callback : - usb_serial_generic_write_bulk_callback), - port); + port->write_urb->transfer_buffer_length = count; /* send the data out the bulk port */ result = usb_submit_urb(port->write_urb, GFP_ATOMIC); @@ -405,21 +396,9 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty) int usb_serial_generic_submit_read_urb(struct usb_serial_port *port, gfp_t mem_flags) { - struct urb *urb = port->read_urb; - struct usb_serial *serial = port->serial; int result; - /* Continue reading from device */ - usb_fill_bulk_urb(urb, serial->dev, - usb_rcvbulkpipe(serial->dev, - port->bulk_in_endpointAddress), - urb->transfer_buffer, - urb->transfer_buffer_length, - ((serial->type->read_bulk_callback) ? - serial->type->read_bulk_callback : - usb_serial_generic_read_bulk_callback), port); - - result = usb_submit_urb(urb, mem_flags); + result = usb_submit_urb(port->read_urb, mem_flags); if (result && result != -EPERM) { dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", |
