USB: centralize -EREMOTEIO handling
This patch (as969) continues the ongoing changes to the way HCDs report URB statuses. The programming interface has been simplified by making usbcore responsible for clearing urb->hcpriv and for setting -EREMOTEIO status when an URB with the URB_SHORT_NOT_OK flag ends up as a short transfer. By moving the work out of the HCDs, this removes a fair amount of repeated code. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: David Brownell <david-b@pacbell.net> CC: Olav Kongas <ok@artecdesign.ee> CC: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> CC: Tony Olech <tony.olech@elandigitalsystems.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
ee7d1f3f0c
commit
b0d9efba3e
@@ -519,7 +519,6 @@ static void u132_hcd_giveback_urb(struct u132 *u132, struct u132_endp *endp,
|
||||
struct usb_hcd *hcd = u132_to_hcd(u132);
|
||||
urb->error_count = 0;
|
||||
urb->status = status;
|
||||
urb->hcpriv = NULL;
|
||||
spin_lock_irqsave(&endp->queue_lock.slock, irqs);
|
||||
usb_hcd_unlink_urb_from_ep(hcd, urb);
|
||||
endp->queue_next += 1;
|
||||
@@ -560,7 +559,6 @@ static void u132_hcd_abandon_urb(struct u132 *u132, struct u132_endp *endp,
|
||||
struct usb_hcd *hcd = u132_to_hcd(u132);
|
||||
urb->error_count = 0;
|
||||
urb->status = status;
|
||||
urb->hcpriv = NULL;
|
||||
spin_lock_irqsave(&endp->queue_lock.slock, irqs);
|
||||
usb_hcd_unlink_urb_from_ep(hcd, urb);
|
||||
endp->queue_next += 1;
|
||||
@@ -2430,7 +2428,6 @@ static int dequeue_from_overflow_chain(struct u132 *u132,
|
||||
list_del(scan);
|
||||
endp->queue_size -= 1;
|
||||
urb->error_count = 0;
|
||||
urb->hcpriv = NULL;
|
||||
usb_hcd_giveback_urb(hcd, urb);
|
||||
return 0;
|
||||
} else
|
||||
@@ -2472,7 +2469,6 @@ static int u132_endp_urb_dequeue(struct u132 *u132, struct u132_endp *endp,
|
||||
endp->edset_flush = 1;
|
||||
u132_endp_queue_work(u132, endp, 0);
|
||||
spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
|
||||
urb->hcpriv = NULL;
|
||||
return 0;
|
||||
} else {
|
||||
spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
|
||||
@@ -2517,7 +2513,6 @@ static int u132_endp_urb_dequeue(struct u132 *u132, struct u132_endp *endp,
|
||||
irqs);
|
||||
kfree(urbq);
|
||||
} urb->error_count = 0;
|
||||
urb->hcpriv = NULL;
|
||||
usb_hcd_giveback_urb(hcd, urb);
|
||||
return 0;
|
||||
} else if (list_empty(&endp->urb_more)) {
|
||||
|
Reference in New Issue
Block a user