diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 1 | ||||
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 1 | ||||
-rw-r--r-- | drivers/usb/host/oxu210hp-hcd.c | 9 | ||||
-rw-r--r-- | drivers/usb/host/pci-quirks.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/u132-hcd.c | 8 |
5 files changed, 2 insertions, 19 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index a3ef2a9d9dc2..6fcffe15a005 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -1041,7 +1041,6 @@ nogood: | |||
1041 | ep->hcpriv = NULL; | 1041 | ep->hcpriv = NULL; |
1042 | done: | 1042 | done: |
1043 | spin_unlock_irqrestore (&ehci->lock, flags); | 1043 | spin_unlock_irqrestore (&ehci->lock, flags); |
1044 | return; | ||
1045 | } | 1044 | } |
1046 | 1045 | ||
1047 | static void | 1046 | static void |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 02864a237a2c..3ceb097e165a 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -370,7 +370,6 @@ sanitize: | |||
370 | } | 370 | } |
371 | ep->hcpriv = NULL; | 371 | ep->hcpriv = NULL; |
372 | spin_unlock_irqrestore (&ohci->lock, flags); | 372 | spin_unlock_irqrestore (&ohci->lock, flags); |
373 | return; | ||
374 | } | 373 | } |
375 | 374 | ||
376 | static int ohci_get_frame (struct usb_hcd *hcd) | 375 | static int ohci_get_frame (struct usb_hcd *hcd) |
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index f608dfd09a8a..de9e1c35da45 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c | |||
@@ -544,8 +544,6 @@ static void oxu_buf_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd) | |||
544 | qtd->buffer = NULL; | 544 | qtd->buffer = NULL; |
545 | 545 | ||
546 | spin_unlock(&oxu->mem_lock); | 546 | spin_unlock(&oxu->mem_lock); |
547 | |||
548 | return; | ||
549 | } | 547 | } |
550 | 548 | ||
551 | static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma) | 549 | static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma) |
@@ -571,8 +569,6 @@ static inline void oxu_qtd_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd) | |||
571 | oxu->qtd_used[index] = 0; | 569 | oxu->qtd_used[index] = 0; |
572 | 570 | ||
573 | spin_unlock(&oxu->mem_lock); | 571 | spin_unlock(&oxu->mem_lock); |
574 | |||
575 | return; | ||
576 | } | 572 | } |
577 | 573 | ||
578 | static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu) | 574 | static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu) |
@@ -615,8 +611,6 @@ static void oxu_qh_free(struct oxu_hcd *oxu, struct ehci_qh *qh) | |||
615 | oxu->qh_used[index] = 0; | 611 | oxu->qh_used[index] = 0; |
616 | 612 | ||
617 | spin_unlock(&oxu->mem_lock); | 613 | spin_unlock(&oxu->mem_lock); |
618 | |||
619 | return; | ||
620 | } | 614 | } |
621 | 615 | ||
622 | static void qh_destroy(struct kref *kref) | 616 | static void qh_destroy(struct kref *kref) |
@@ -693,8 +687,6 @@ static void oxu_murb_free(struct oxu_hcd *oxu, struct oxu_murb *murb) | |||
693 | oxu->murb_used[index] = 0; | 687 | oxu->murb_used[index] = 0; |
694 | 688 | ||
695 | spin_unlock(&oxu->mem_lock); | 689 | spin_unlock(&oxu->mem_lock); |
696 | |||
697 | return; | ||
698 | } | 690 | } |
699 | 691 | ||
700 | static struct oxu_murb *oxu_murb_alloc(struct oxu_hcd *oxu) | 692 | static struct oxu_murb *oxu_murb_alloc(struct oxu_hcd *oxu) |
@@ -3073,7 +3065,6 @@ nogood: | |||
3073 | ep->hcpriv = NULL; | 3065 | ep->hcpriv = NULL; |
3074 | done: | 3066 | done: |
3075 | spin_unlock_irqrestore(&oxu->lock, flags); | 3067 | spin_unlock_irqrestore(&oxu->lock, flags); |
3076 | return; | ||
3077 | } | 3068 | } |
3078 | 3069 | ||
3079 | static int oxu_get_frame(struct usb_hcd *hcd) | 3070 | static int oxu_get_frame(struct usb_hcd *hcd) |
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 83b5f9cea85a..5b37b08e0d80 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c | |||
@@ -338,8 +338,6 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
338 | writel(0x3f, op_reg_base + EHCI_USBSTS); | 338 | writel(0x3f, op_reg_base + EHCI_USBSTS); |
339 | 339 | ||
340 | iounmap(base); | 340 | iounmap(base); |
341 | |||
342 | return; | ||
343 | } | 341 | } |
344 | 342 | ||
345 | /* | 343 | /* |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 5b31bae92dbc..fab764946c74 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -316,7 +316,6 @@ static void u132_ring_requeue_work(struct u132 *u132, struct u132_ring *ring, | |||
316 | } else if (queue_delayed_work(workqueue, &ring->scheduler, 0)) | 316 | } else if (queue_delayed_work(workqueue, &ring->scheduler, 0)) |
317 | return; | 317 | return; |
318 | kref_put(&u132->kref, u132_hcd_delete); | 318 | kref_put(&u132->kref, u132_hcd_delete); |
319 | return; | ||
320 | } | 319 | } |
321 | 320 | ||
322 | static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, | 321 | static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, |
@@ -324,7 +323,6 @@ static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, | |||
324 | { | 323 | { |
325 | kref_get(&u132->kref); | 324 | kref_get(&u132->kref); |
326 | u132_ring_requeue_work(u132, ring, delta); | 325 | u132_ring_requeue_work(u132, ring, delta); |
327 | return; | ||
328 | } | 326 | } |
329 | 327 | ||
330 | static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring) | 328 | static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring) |
@@ -543,7 +541,6 @@ static void u132_hcd_giveback_urb(struct u132 *u132, struct u132_endp *endp, | |||
543 | mutex_unlock(&u132->scheduler_lock); | 541 | mutex_unlock(&u132->scheduler_lock); |
544 | u132_endp_put_kref(u132, endp); | 542 | u132_endp_put_kref(u132, endp); |
545 | usb_hcd_giveback_urb(hcd, urb, status); | 543 | usb_hcd_giveback_urb(hcd, urb, status); |
546 | return; | ||
547 | } | 544 | } |
548 | 545 | ||
549 | static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp, | 546 | static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp, |
@@ -574,8 +571,8 @@ static void u132_hcd_abandon_urb(struct u132 *u132, struct u132_endp *endp, | |||
574 | endp->active = 0; | 571 | endp->active = 0; |
575 | spin_unlock_irqrestore(&endp->queue_lock.slock, irqs); | 572 | spin_unlock_irqrestore(&endp->queue_lock.slock, irqs); |
576 | kfree(urbq); | 573 | kfree(urbq); |
577 | } usb_hcd_giveback_urb(hcd, urb, status); | 574 | } |
578 | return; | 575 | usb_hcd_giveback_urb(hcd, urb, status); |
579 | } | 576 | } |
580 | 577 | ||
581 | static inline int edset_input(struct u132 *u132, struct u132_ring *ring, | 578 | static inline int edset_input(struct u132 *u132, struct u132_ring *ring, |
@@ -3085,7 +3082,6 @@ static void u132_initialise(struct u132 *u132, struct platform_device *pdev) | |||
3085 | u132->endp[endps] = NULL; | 3082 | u132->endp[endps] = NULL; |
3086 | 3083 | ||
3087 | mutex_unlock(&u132->sw_lock); | 3084 | mutex_unlock(&u132->sw_lock); |
3088 | return; | ||
3089 | } | 3085 | } |
3090 | 3086 | ||
3091 | static int __devinit u132_probe(struct platform_device *pdev) | 3087 | static int __devinit u132_probe(struct platform_device *pdev) |