aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-11-06 13:06:29 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-15 13:35:26 -0500
commitb7195188e9884f62efd96a3a91415418cb44381f (patch)
treea328ed1b0c43371e331deb1c9a9692f84e837025 /drivers/usb
parent5833041f1b130e5823a99d03b14538282e5ad345 (diff)
USB: serial: remove unnecessary reinitialisations of urb fields
Remove unnecessary reinitialisations of completion and context fields of urbs. Compile-only tested. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/io_ti.c4
-rw-r--r--drivers/usb/serial/ti_usb_3410_5052.c3
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 29fba8ccf8e..589f11a0f7e 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -1951,7 +1951,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
1951 status = -EINVAL; 1951 status = -EINVAL;
1952 goto release_es_lock; 1952 goto release_es_lock;
1953 } 1953 }
1954 urb->complete = edge_interrupt_callback;
1955 urb->context = edge_serial; 1954 urb->context = edge_serial;
1956 status = usb_submit_urb(urb, GFP_KERNEL); 1955 status = usb_submit_urb(urb, GFP_KERNEL);
1957 if (status) { 1956 if (status) {
@@ -1978,7 +1977,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
1978 goto unlink_int_urb; 1977 goto unlink_int_urb;
1979 } 1978 }
1980 edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING; 1979 edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
1981 urb->complete = edge_bulk_in_callback;
1982 urb->context = edge_port; 1980 urb->context = edge_port;
1983 status = usb_submit_urb(urb, GFP_KERNEL); 1981 status = usb_submit_urb(urb, GFP_KERNEL);
1984 if (status) { 1982 if (status) {
@@ -2257,8 +2255,6 @@ static int restart_read(struct edgeport_port *edge_port)
2257 2255
2258 if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPED) { 2256 if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPED) {
2259 urb = edge_port->port->read_urb; 2257 urb = edge_port->port->read_urb;
2260 urb->complete = edge_bulk_in_callback;
2261 urb->context = edge_port;
2262 status = usb_submit_urb(urb, GFP_ATOMIC); 2258 status = usb_submit_urb(urb, GFP_ATOMIC);
2263 } 2259 }
2264 edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING; 2260 edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 6d16717ef4f..4af21f46096 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -535,7 +535,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
535 status = -EINVAL; 535 status = -EINVAL;
536 goto release_lock; 536 goto release_lock;
537 } 537 }
538 urb->complete = ti_interrupt_callback;
539 urb->context = tdev; 538 urb->context = tdev;
540 status = usb_submit_urb(urb, GFP_KERNEL); 539 status = usb_submit_urb(urb, GFP_KERNEL);
541 if (status) { 540 if (status) {
@@ -618,7 +617,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
618 goto unlink_int_urb; 617 goto unlink_int_urb;
619 } 618 }
620 tport->tp_read_urb_state = TI_READ_URB_RUNNING; 619 tport->tp_read_urb_state = TI_READ_URB_RUNNING;
621 urb->complete = ti_bulk_in_callback;
622 urb->context = tport; 620 urb->context = tport;
623 status = usb_submit_urb(urb, GFP_KERNEL); 621 status = usb_submit_urb(urb, GFP_KERNEL);
624 if (status) { 622 if (status) {
@@ -1571,7 +1569,6 @@ static int ti_restart_read(struct ti_port *tport, struct tty_struct *tty)
1571 tport->tp_read_urb_state = TI_READ_URB_RUNNING; 1569 tport->tp_read_urb_state = TI_READ_URB_RUNNING;
1572 urb = tport->tp_port->read_urb; 1570 urb = tport->tp_port->read_urb;
1573 spin_unlock_irqrestore(&tport->tp_lock, flags); 1571 spin_unlock_irqrestore(&tport->tp_lock, flags);
1574 urb->complete = ti_bulk_in_callback;
1575 urb->context = tport; 1572 urb->context = tport;
1576 status = usb_submit_urb(urb, GFP_KERNEL); 1573 status = usb_submit_urb(urb, GFP_KERNEL);
1577 } else { 1574 } else {