USB: serial: remove unnecessary reinitialisations of urb fields
authorJohan Hovold <jhovold@gmail.com>
Sun, 6 Nov 2011 18:06:29 +0000 (19:06 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Nov 2011 18:35:26 +0000 (10:35 -0800)
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>
drivers/usb/serial/io_ti.c
drivers/usb/serial/ti_usb_3410_5052.c

index 29fba8ccf8e2431cad40ee52d25190c3b82eea0b..589f11a0f7e222d065afd4a7ee02945ad0529470 100644 (file)
@@ -1951,7 +1951,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
                        status = -EINVAL;
                        goto release_es_lock;
                }
-               urb->complete = edge_interrupt_callback;
                urb->context = edge_serial;
                status = usb_submit_urb(urb, GFP_KERNEL);
                if (status) {
@@ -1978,7 +1977,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
                goto unlink_int_urb;
        }
        edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
-       urb->complete = edge_bulk_in_callback;
        urb->context = edge_port;
        status = usb_submit_urb(urb, GFP_KERNEL);
        if (status) {
@@ -2257,8 +2255,6 @@ static int restart_read(struct edgeport_port *edge_port)
 
        if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPED) {
                urb = edge_port->port->read_urb;
-               urb->complete = edge_bulk_in_callback;
-               urb->context = edge_port;
                status = usb_submit_urb(urb, GFP_ATOMIC);
        }
        edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
index 6d16717ef4f7f51be98c69521b2702e390409dd1..4af21f46096e564fcfe767c327aab0378a0c845d 100644 (file)
@@ -535,7 +535,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
                        status = -EINVAL;
                        goto release_lock;
                }
-               urb->complete = ti_interrupt_callback;
                urb->context = tdev;
                status = usb_submit_urb(urb, GFP_KERNEL);
                if (status) {
@@ -618,7 +617,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
                goto unlink_int_urb;
        }
        tport->tp_read_urb_state = TI_READ_URB_RUNNING;
-       urb->complete = ti_bulk_in_callback;
        urb->context = tport;
        status = usb_submit_urb(urb, GFP_KERNEL);
        if (status) {
@@ -1571,7 +1569,6 @@ static int ti_restart_read(struct ti_port *tport, struct tty_struct *tty)
                tport->tp_read_urb_state = TI_READ_URB_RUNNING;
                urb = tport->tp_port->read_urb;
                spin_unlock_irqrestore(&tport->tp_lock, flags);
-               urb->complete = ti_bulk_in_callback;
                urb->context = tport;
                status = usb_submit_urb(urb, GFP_KERNEL);
        } else  {