diff options
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index a72e041df8e7..2718b5dc4ec1 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -418,7 +418,7 @@ static void postproc_atl_queue(struct isp116x *isp116x) | |||
418 | processed urbs. | 418 | processed urbs. |
419 | */ | 419 | */ |
420 | static void finish_request(struct isp116x *isp116x, struct isp116x_ep *ep, | 420 | static void finish_request(struct isp116x *isp116x, struct isp116x_ep *ep, |
421 | struct urb *urb, struct pt_regs *regs) | 421 | struct urb *urb) |
422 | __releases(isp116x->lock) __acquires(isp116x->lock) | 422 | __releases(isp116x->lock) __acquires(isp116x->lock) |
423 | { | 423 | { |
424 | unsigned i; | 424 | unsigned i; |
@@ -432,7 +432,7 @@ __releases(isp116x->lock) __acquires(isp116x->lock) | |||
432 | urb_dbg(urb, "Finish"); | 432 | urb_dbg(urb, "Finish"); |
433 | 433 | ||
434 | spin_unlock(&isp116x->lock); | 434 | spin_unlock(&isp116x->lock); |
435 | usb_hcd_giveback_urb(isp116x_to_hcd(isp116x), urb, regs); | 435 | usb_hcd_giveback_urb(isp116x_to_hcd(isp116x), urb); |
436 | spin_lock(&isp116x->lock); | 436 | spin_lock(&isp116x->lock); |
437 | 437 | ||
438 | /* take idle endpoints out of the schedule */ | 438 | /* take idle endpoints out of the schedule */ |
@@ -568,7 +568,7 @@ static void start_atl_transfers(struct isp116x *isp116x) | |||
568 | /* | 568 | /* |
569 | Finish the processed transfers | 569 | Finish the processed transfers |
570 | */ | 570 | */ |
571 | static void finish_atl_transfers(struct isp116x *isp116x, struct pt_regs *regs) | 571 | static void finish_atl_transfers(struct isp116x *isp116x) |
572 | { | 572 | { |
573 | struct isp116x_ep *ep; | 573 | struct isp116x_ep *ep; |
574 | struct urb *urb; | 574 | struct urb *urb; |
@@ -590,12 +590,12 @@ static void finish_atl_transfers(struct isp116x *isp116x, struct pt_regs *regs) | |||
590 | occured, while URB_SHORT_NOT_OK was set */ | 590 | occured, while URB_SHORT_NOT_OK was set */ |
591 | if (urb && urb->status != -EINPROGRESS | 591 | if (urb && urb->status != -EINPROGRESS |
592 | && ep->nextpid != USB_PID_ACK) | 592 | && ep->nextpid != USB_PID_ACK) |
593 | finish_request(isp116x, ep, urb, regs); | 593 | finish_request(isp116x, ep, urb); |
594 | } | 594 | } |
595 | atomic_dec(&isp116x->atl_finishing); | 595 | atomic_dec(&isp116x->atl_finishing); |
596 | } | 596 | } |
597 | 597 | ||
598 | static irqreturn_t isp116x_irq(struct usb_hcd *hcd, struct pt_regs *regs) | 598 | static irqreturn_t isp116x_irq(struct usb_hcd *hcd) |
599 | { | 599 | { |
600 | struct isp116x *isp116x = hcd_to_isp116x(hcd); | 600 | struct isp116x *isp116x = hcd_to_isp116x(hcd); |
601 | u16 irqstat; | 601 | u16 irqstat; |
@@ -608,7 +608,7 @@ static irqreturn_t isp116x_irq(struct usb_hcd *hcd, struct pt_regs *regs) | |||
608 | 608 | ||
609 | if (irqstat & (HCuPINT_ATL | HCuPINT_SOF)) { | 609 | if (irqstat & (HCuPINT_ATL | HCuPINT_SOF)) { |
610 | ret = IRQ_HANDLED; | 610 | ret = IRQ_HANDLED; |
611 | finish_atl_transfers(isp116x, regs); | 611 | finish_atl_transfers(isp116x); |
612 | } | 612 | } |
613 | 613 | ||
614 | if (irqstat & HCuPINT_OPR) { | 614 | if (irqstat & HCuPINT_OPR) { |
@@ -824,7 +824,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd, | |||
824 | spin_lock(&urb->lock); | 824 | spin_lock(&urb->lock); |
825 | if (urb->status != -EINPROGRESS) { | 825 | if (urb->status != -EINPROGRESS) { |
826 | spin_unlock(&urb->lock); | 826 | spin_unlock(&urb->lock); |
827 | finish_request(isp116x, ep, urb, NULL); | 827 | finish_request(isp116x, ep, urb); |
828 | ret = 0; | 828 | ret = 0; |
829 | goto fail; | 829 | goto fail; |
830 | } | 830 | } |
@@ -870,7 +870,7 @@ static int isp116x_urb_dequeue(struct usb_hcd *hcd, struct urb *urb) | |||
870 | } | 870 | } |
871 | 871 | ||
872 | if (urb) | 872 | if (urb) |
873 | finish_request(isp116x, ep, urb, NULL); | 873 | finish_request(isp116x, ep, urb); |
874 | 874 | ||
875 | spin_unlock_irqrestore(&isp116x->lock, flags); | 875 | spin_unlock_irqrestore(&isp116x->lock, flags); |
876 | return 0; | 876 | return 0; |