diff options
author | Johan Hovold <jhovold@gmail.com> | 2010-02-25 14:52:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:55:21 -0500 |
commit | 124d255382ddd37ffa920e9f5183efa54bbfe4f2 (patch) | |
tree | f7e7e4b1c93038c9cdce39a99ec9372c4ce27df1 /drivers/usb/serial/pl2303.c | |
parent | a880830e48e6fb7694de76ebb4a6c6bb0800f758 (diff) |
USB: pl2303: remove unnecessary reset of usb_device in urbs
URBs are initialised at probe and do not change.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/pl2303.c')
-rw-r--r-- | drivers/usb/serial/pl2303.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 895d0722183e..73d5f346d3e0 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -451,7 +451,6 @@ static void pl2303_send(struct usb_serial_port *port) | |||
451 | port->write_urb->transfer_buffer); | 451 | port->write_urb->transfer_buffer); |
452 | 452 | ||
453 | port->write_urb->transfer_buffer_length = count; | 453 | port->write_urb->transfer_buffer_length = count; |
454 | port->write_urb->dev = port->serial->dev; | ||
455 | result = usb_submit_urb(port->write_urb, GFP_ATOMIC); | 454 | result = usb_submit_urb(port->write_urb, GFP_ATOMIC); |
456 | if (result) { | 455 | if (result) { |
457 | dev_err(&port->dev, "%s - failed submitting write urb," | 456 | dev_err(&port->dev, "%s - failed submitting write urb," |
@@ -769,7 +768,6 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
769 | pl2303_set_termios(tty, port, &tmp_termios); | 768 | pl2303_set_termios(tty, port, &tmp_termios); |
770 | 769 | ||
771 | dbg("%s - submitting read urb", __func__); | 770 | dbg("%s - submitting read urb", __func__); |
772 | port->read_urb->dev = serial->dev; | ||
773 | result = usb_submit_urb(port->read_urb, GFP_KERNEL); | 771 | result = usb_submit_urb(port->read_urb, GFP_KERNEL); |
774 | if (result) { | 772 | if (result) { |
775 | dev_err(&port->dev, "%s - failed submitting read urb," | 773 | dev_err(&port->dev, "%s - failed submitting read urb," |
@@ -779,7 +777,6 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
779 | } | 777 | } |
780 | 778 | ||
781 | dbg("%s - submitting interrupt urb", __func__); | 779 | dbg("%s - submitting interrupt urb", __func__); |
782 | port->interrupt_in_urb->dev = serial->dev; | ||
783 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); | 780 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); |
784 | if (result) { | 781 | if (result) { |
785 | dev_err(&port->dev, "%s - failed submitting interrupt urb," | 782 | dev_err(&port->dev, "%s - failed submitting interrupt urb," |
@@ -1089,7 +1086,6 @@ static void pl2303_read_bulk_callback(struct urb *urb) | |||
1089 | * the read */ | 1086 | * the read */ |
1090 | dbg("%s - caught -EPROTO, resubmitting the urb", | 1087 | dbg("%s - caught -EPROTO, resubmitting the urb", |
1091 | __func__); | 1088 | __func__); |
1092 | urb->dev = port->serial->dev; | ||
1093 | result = usb_submit_urb(urb, GFP_ATOMIC); | 1089 | result = usb_submit_urb(urb, GFP_ATOMIC); |
1094 | if (result) | 1090 | if (result) |
1095 | dev_err(&urb->dev->dev, "%s - failed" | 1091 | dev_err(&urb->dev->dev, "%s - failed" |
@@ -1116,7 +1112,6 @@ static void pl2303_read_bulk_callback(struct urb *urb) | |||
1116 | } | 1112 | } |
1117 | tty_kref_put(tty); | 1113 | tty_kref_put(tty); |
1118 | /* Schedule the next read _if_ we are still open */ | 1114 | /* Schedule the next read _if_ we are still open */ |
1119 | urb->dev = port->serial->dev; | ||
1120 | result = usb_submit_urb(urb, GFP_ATOMIC); | 1115 | result = usb_submit_urb(urb, GFP_ATOMIC); |
1121 | if (result && result != -EPERM) | 1116 | if (result && result != -EPERM) |
1122 | dev_err(&urb->dev->dev, "%s - failed resubmitting" | 1117 | dev_err(&urb->dev->dev, "%s - failed resubmitting" |
@@ -1150,7 +1145,6 @@ static void pl2303_write_bulk_callback(struct urb *urb) | |||
1150 | dbg("%s - nonzero write bulk status received: %d", __func__, | 1145 | dbg("%s - nonzero write bulk status received: %d", __func__, |
1151 | status); | 1146 | status); |
1152 | port->write_urb->transfer_buffer_length = 1; | 1147 | port->write_urb->transfer_buffer_length = 1; |
1153 | port->write_urb->dev = port->serial->dev; | ||
1154 | result = usb_submit_urb(port->write_urb, GFP_ATOMIC); | 1148 | result = usb_submit_urb(port->write_urb, GFP_ATOMIC); |
1155 | if (result) | 1149 | if (result) |
1156 | dev_err(&urb->dev->dev, "%s - failed resubmitting write" | 1150 | dev_err(&urb->dev->dev, "%s - failed resubmitting write" |