diff options
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index d1d68c402251..9be6b303e784 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -261,7 +261,7 @@ static int ohci_urb_enqueue ( | |||
261 | if (urb->status != -EINPROGRESS) { | 261 | if (urb->status != -EINPROGRESS) { |
262 | spin_unlock (&urb->lock); | 262 | spin_unlock (&urb->lock); |
263 | urb->hcpriv = urb_priv; | 263 | urb->hcpriv = urb_priv; |
264 | finish_urb (ohci, urb, NULL); | 264 | finish_urb (ohci, urb); |
265 | retval = 0; | 265 | retval = 0; |
266 | goto fail; | 266 | goto fail; |
267 | } | 267 | } |
@@ -337,7 +337,7 @@ static int ohci_urb_dequeue (struct usb_hcd *hcd, struct urb *urb) | |||
337 | * any more ... just clean up every urb's memory. | 337 | * any more ... just clean up every urb's memory. |
338 | */ | 338 | */ |
339 | if (urb->hcpriv) | 339 | if (urb->hcpriv) |
340 | finish_urb (ohci, urb, NULL); | 340 | finish_urb (ohci, urb); |
341 | } | 341 | } |
342 | spin_unlock_irqrestore (&ohci->lock, flags); | 342 | spin_unlock_irqrestore (&ohci->lock, flags); |
343 | return 0; | 343 | return 0; |
@@ -369,7 +369,7 @@ rescan: | |||
369 | if (!HC_IS_RUNNING (hcd->state)) { | 369 | if (!HC_IS_RUNNING (hcd->state)) { |
370 | sanitize: | 370 | sanitize: |
371 | ed->state = ED_IDLE; | 371 | ed->state = ED_IDLE; |
372 | finish_unlinks (ohci, 0, NULL); | 372 | finish_unlinks (ohci, 0); |
373 | } | 373 | } |
374 | 374 | ||
375 | switch (ed->state) { | 375 | switch (ed->state) { |
@@ -691,7 +691,7 @@ retry: | |||
691 | 691 | ||
692 | /* an interrupt happens */ | 692 | /* an interrupt happens */ |
693 | 693 | ||
694 | static irqreturn_t ohci_irq (struct usb_hcd *hcd, struct pt_regs *ptregs) | 694 | static irqreturn_t ohci_irq (struct usb_hcd *hcd) |
695 | { | 695 | { |
696 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); | 696 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); |
697 | struct ohci_regs __iomem *regs = ohci->regs; | 697 | struct ohci_regs __iomem *regs = ohci->regs; |
@@ -747,7 +747,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd, struct pt_regs *ptregs) | |||
747 | if (HC_IS_RUNNING(hcd->state)) | 747 | if (HC_IS_RUNNING(hcd->state)) |
748 | ohci_writel (ohci, OHCI_INTR_WDH, ®s->intrdisable); | 748 | ohci_writel (ohci, OHCI_INTR_WDH, ®s->intrdisable); |
749 | spin_lock (&ohci->lock); | 749 | spin_lock (&ohci->lock); |
750 | dl_done_list (ohci, ptregs); | 750 | dl_done_list (ohci); |
751 | spin_unlock (&ohci->lock); | 751 | spin_unlock (&ohci->lock); |
752 | if (HC_IS_RUNNING(hcd->state)) | 752 | if (HC_IS_RUNNING(hcd->state)) |
753 | ohci_writel (ohci, OHCI_INTR_WDH, ®s->intrenable); | 753 | ohci_writel (ohci, OHCI_INTR_WDH, ®s->intrenable); |
@@ -760,7 +760,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd, struct pt_regs *ptregs) | |||
760 | */ | 760 | */ |
761 | spin_lock (&ohci->lock); | 761 | spin_lock (&ohci->lock); |
762 | if (ohci->ed_rm_list) | 762 | if (ohci->ed_rm_list) |
763 | finish_unlinks (ohci, ohci_frame_no(ohci), ptregs); | 763 | finish_unlinks (ohci, ohci_frame_no(ohci)); |
764 | if ((ints & OHCI_INTR_SF) != 0 && !ohci->ed_rm_list | 764 | if ((ints & OHCI_INTR_SF) != 0 && !ohci->ed_rm_list |
765 | && HC_IS_RUNNING(hcd->state)) | 765 | && HC_IS_RUNNING(hcd->state)) |
766 | ohci_writel (ohci, OHCI_INTR_SF, ®s->intrdisable); | 766 | ohci_writel (ohci, OHCI_INTR_SF, ®s->intrdisable); |
@@ -852,7 +852,7 @@ static int ohci_restart (struct ohci_hcd *ohci) | |||
852 | urb->status = -ESHUTDOWN; | 852 | urb->status = -ESHUTDOWN; |
853 | spin_unlock (&urb->lock); | 853 | spin_unlock (&urb->lock); |
854 | } | 854 | } |
855 | finish_unlinks (ohci, 0, NULL); | 855 | finish_unlinks (ohci, 0); |
856 | spin_unlock_irq(&ohci->lock); | 856 | spin_unlock_irq(&ohci->lock); |
857 | 857 | ||
858 | /* paranoia, in case that didn't work: */ | 858 | /* paranoia, in case that didn't work: */ |