diff options
Diffstat (limited to 'drivers/usb/host/uhci-q.c')
-rw-r--r-- | drivers/usb/host/uhci-q.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c index 431e8f31f1a9..06115f22a4fa 100644 --- a/drivers/usb/host/uhci-q.c +++ b/drivers/usb/host/uhci-q.c | |||
@@ -1244,7 +1244,7 @@ done: | |||
1244 | * Finish unlinking an URB and give it back | 1244 | * Finish unlinking an URB and give it back |
1245 | */ | 1245 | */ |
1246 | static void uhci_giveback_urb(struct uhci_hcd *uhci, struct uhci_qh *qh, | 1246 | static void uhci_giveback_urb(struct uhci_hcd *uhci, struct uhci_qh *qh, |
1247 | struct urb *urb, struct pt_regs *regs) | 1247 | struct urb *urb) |
1248 | __releases(uhci->lock) | 1248 | __releases(uhci->lock) |
1249 | __acquires(uhci->lock) | 1249 | __acquires(uhci->lock) |
1250 | { | 1250 | { |
@@ -1293,7 +1293,7 @@ __acquires(uhci->lock) | |||
1293 | } | 1293 | } |
1294 | 1294 | ||
1295 | spin_unlock(&uhci->lock); | 1295 | spin_unlock(&uhci->lock); |
1296 | usb_hcd_giveback_urb(uhci_to_hcd(uhci), urb, regs); | 1296 | usb_hcd_giveback_urb(uhci_to_hcd(uhci), urb); |
1297 | spin_lock(&uhci->lock); | 1297 | spin_lock(&uhci->lock); |
1298 | 1298 | ||
1299 | /* If the queue is now empty, we can unlink the QH and give up its | 1299 | /* If the queue is now empty, we can unlink the QH and give up its |
@@ -1313,8 +1313,7 @@ __acquires(uhci->lock) | |||
1313 | (qh->state == QH_STATE_UNLINKING && \ | 1313 | (qh->state == QH_STATE_UNLINKING && \ |
1314 | uhci->frame_number + uhci->is_stopped != qh->unlink_frame) | 1314 | uhci->frame_number + uhci->is_stopped != qh->unlink_frame) |
1315 | 1315 | ||
1316 | static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh, | 1316 | static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh) |
1317 | struct pt_regs *regs) | ||
1318 | { | 1317 | { |
1319 | struct urb_priv *urbp; | 1318 | struct urb_priv *urbp; |
1320 | struct urb *urb; | 1319 | struct urb *urb; |
@@ -1347,7 +1346,7 @@ static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh, | |||
1347 | return; | 1346 | return; |
1348 | } | 1347 | } |
1349 | 1348 | ||
1350 | uhci_giveback_urb(uhci, qh, urb, regs); | 1349 | uhci_giveback_urb(uhci, qh, urb); |
1351 | if (status < 0 && qh->type != USB_ENDPOINT_XFER_ISOC) | 1350 | if (status < 0 && qh->type != USB_ENDPOINT_XFER_ISOC) |
1352 | break; | 1351 | break; |
1353 | } | 1352 | } |
@@ -1372,7 +1371,7 @@ restart: | |||
1372 | qh->is_stopped = 0; | 1371 | qh->is_stopped = 0; |
1373 | return; | 1372 | return; |
1374 | } | 1373 | } |
1375 | uhci_giveback_urb(uhci, qh, urb, regs); | 1374 | uhci_giveback_urb(uhci, qh, urb); |
1376 | goto restart; | 1375 | goto restart; |
1377 | } | 1376 | } |
1378 | } | 1377 | } |
@@ -1487,7 +1486,7 @@ done: | |||
1487 | /* | 1486 | /* |
1488 | * Process events in the schedule, but only in one thread at a time | 1487 | * Process events in the schedule, but only in one thread at a time |
1489 | */ | 1488 | */ |
1490 | static void uhci_scan_schedule(struct uhci_hcd *uhci, struct pt_regs *regs) | 1489 | static void uhci_scan_schedule(struct uhci_hcd *uhci) |
1491 | { | 1490 | { |
1492 | int i; | 1491 | int i; |
1493 | struct uhci_qh *qh; | 1492 | struct uhci_qh *qh; |
@@ -1515,7 +1514,7 @@ rescan: | |||
1515 | struct uhci_qh, node); | 1514 | struct uhci_qh, node); |
1516 | 1515 | ||
1517 | if (uhci_advance_check(uhci, qh)) { | 1516 | if (uhci_advance_check(uhci, qh)) { |
1518 | uhci_scan_qh(uhci, qh, regs); | 1517 | uhci_scan_qh(uhci, qh); |
1519 | if (qh->state == QH_STATE_ACTIVE) { | 1518 | if (qh->state == QH_STATE_ACTIVE) { |
1520 | uhci_urbp_wants_fsbr(uhci, | 1519 | uhci_urbp_wants_fsbr(uhci, |
1521 | list_entry(qh->queue.next, struct urb_priv, node)); | 1520 | list_entry(qh->queue.next, struct urb_priv, node)); |