Remove superfluous return statements from the end of void functions.

10 files changed, 0 insertions, 317 deletions

diff --git a/sys/dev/usb2/controller/at91dci.c b/sys/dev/usb2/controller/at91dci.c
index 1363c0d..2827fe6 100644
--- a/sys/dev/usb2/controller/at91dci.c
+++ b/sys/dev/usb2/controller/at91dci.c
@@ -200,7 +200,6 @@ at91dci_get_hw_ep_profile(struct usb2_device *udev,
 	} else {
 		*ppf = NULL;
 	}
-	return;
 }
 
 static void
@@ -219,7 +218,6 @@ at91dci_clocks_on(struct at91dci_softc *sc)
 		/* enable Transceiver */
 		AT91_UDP_WRITE_4(sc, AT91_UDP_TXVC, 0);
 	}
-	return;
 }
 
 static void
@@ -237,7 +235,6 @@ at91dci_clocks_off(struct at91dci_softc *sc)
 		}
 		sc->sc_flags.clocks_off = 1;
 	}
-	return;
 }
 
 static void
@@ -250,7 +247,6 @@ at91dci_pull_up(struct at91dci_softc *sc)
 		sc->sc_flags.d_pulled_up = 1;
 		(sc->sc_pull_up) (sc->sc_pull_arg);
 	}
-	return;
 }
 
 static void
@@ -262,7 +258,6 @@ at91dci_pull_down(struct at91dci_softc *sc)
 		sc->sc_flags.d_pulled_up = 0;
 		(sc->sc_pull_down) (sc->sc_pull_arg);
 	}
-	return;
 }
 
 static void
@@ -279,8 +274,6 @@ at91dci_wakeup_peer(struct at91dci_softc *sc)
 		return;
 	}
 	AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, temp);
-
-	return;
 }
 
 static void
@@ -304,8 +297,6 @@ at91dci_rem_wakeup_set(struct usb2_device *udev, uint8_t is_on)
 	}
 
 	AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, temp);
-
-	return;
 }
 
 static void
@@ -315,8 +306,6 @@ at91dci_set_address(struct at91dci_softc *sc, uint8_t addr)
 
 	AT91_UDP_WRITE_4(sc, AT91_UDP_FADDR, addr |
 	    AT91_UDP_FADDR_EN);
-
-	return;
 }
 
 static uint8_t
@@ -756,7 +745,6 @@ repeat:
 			goto repeat;
 		}
 	}
-	return;
 }
 
 static void
@@ -792,8 +780,6 @@ at91dci_vbus_interrupt(struct usb2_bus *bus, uint8_t is_on)
 	}
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -880,8 +866,6 @@ at91dci_interrupt(struct at91dci_softc *sc)
 		at91dci_interrupt_poll(sc);
 	}
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -906,7 +890,6 @@ at91dci_setup_standard_chain_sub(struct at91dci_std_temp *temp)
 	td->did_stall = 0;
 	td->short_pkt = temp->short_pkt;
 	td->alt_next = temp->setup_alt_next;
-	return;
 }
 
 static void
@@ -1054,7 +1037,6 @@ at91dci_setup_standard_chain(struct usb2_xfer *xfer)
 		td = xfer->td_transfer_first;
 		td->fifo_bank = 1;
 	}
-	return;
 }
 
 static void
@@ -1071,8 +1053,6 @@ at91dci_timeout(void *arg)
 	at91dci_device_done(xfer, USB_ERR_TIMEOUT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1104,7 +1084,6 @@ at91dci_start_standard_chain(struct usb2_xfer *xfer)
 			    &at91dci_timeout, xfer->timeout);
 		}
 	}
-	return;
 }
 
 static void
@@ -1240,7 +1219,6 @@ at91dci_standard_done(struct usb2_xfer *xfer)
 	}
 done:
 	at91dci_device_done(xfer, err);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1270,7 +1248,6 @@ at91dci_device_done(struct usb2_xfer *xfer, usb2_error_t error)
 	}
 	/* dequeue transfer and start next transfer */
 	usb2_transfer_done(xfer, error);
-	return;
 }
 
 static void
@@ -1296,7 +1273,6 @@ at91dci_set_stall(struct usb2_device *udev, struct usb2_xfer *xfer,
 	csr_val = AT91_UDP_READ_4(sc, csr_reg);
 	AT91_CSR_ACK(csr_val, AT91_UDP_CSR_FORCESTALL);
 	AT91_UDP_WRITE_4(sc, csr_reg, csr_val);
-	return;
 }
 
 static void
@@ -1393,8 +1369,6 @@ at91dci_clear_stall_sub(struct at91dci_softc *sc, uint8_t ep_no,
 
 	/* enable endpoint */
 	AT91_UDP_WRITE_4(sc, AT91_UDP_CSR(ep_no), csr_val);
-
-	return;
 }
 
 static void
@@ -1423,7 +1397,6 @@ at91dci_clear_stall(struct usb2_device *udev, struct usb2_pipe *pipe)
 	    (ed->bEndpointAddress & UE_ADDR),
 	    (ed->bmAttributes & UE_XFERTYPE),
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
-	return;
 }
 
 usb2_error_t
@@ -1511,8 +1484,6 @@ at91dci_uninit(struct at91dci_softc *sc)
 	at91dci_pull_down(sc);
 	at91dci_clocks_off(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -1536,7 +1507,6 @@ at91dci_do_poll(struct usb2_bus *bus)
 	at91dci_interrupt_poll(sc);
 	at91dci_root_ctrl_poll(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1552,7 +1522,6 @@ static void
 at91dci_device_bulk_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1567,7 +1536,6 @@ at91dci_device_bulk_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_bulk_methods =
@@ -1593,7 +1561,6 @@ static void
 at91dci_device_ctrl_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1608,7 +1575,6 @@ at91dci_device_ctrl_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_ctrl_methods =
@@ -1634,7 +1600,6 @@ static void
 at91dci_device_intr_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1649,7 +1614,6 @@ at91dci_device_intr_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_intr_methods =
@@ -1675,7 +1639,6 @@ static void
 at91dci_device_isoc_fs_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1728,7 +1691,6 @@ at91dci_device_isoc_fs_enter(struct usb2_xfer *xfer)
 
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
-	return;
 }
 
 static void
@@ -1736,7 +1698,6 @@ at91dci_device_isoc_fs_start(struct usb2_xfer *xfer)
 {
 	/* start TD chain */
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_isoc_fs_methods =
@@ -1771,7 +1732,6 @@ at91dci_root_ctrl_close(struct usb2_xfer *xfer)
 		sc->sc_root_ctrl.xfer = NULL;
 	}
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 /*
@@ -1876,8 +1836,6 @@ at91dci_root_ctrl_start(struct usb2_xfer *xfer)
 
 	usb2_config_td_queue_command(
 	    &sc->sc_config_td, NULL, &at91dci_root_ctrl_task, 0, 0);
-
-	return;
 }
 
 static void
@@ -1885,7 +1843,6 @@ at91dci_root_ctrl_task(struct at91dci_softc *sc,
     struct at91dci_config_copy *cc, uint16_t refcount)
 {
 	at91dci_root_ctrl_poll(sc);
-	return;
 }
 
 static void
@@ -2294,7 +2251,6 @@ at91dci_root_ctrl_poll(struct at91dci_softc *sc)
 {
 	usb2_sw_transfer(&sc->sc_root_ctrl,
 	    &at91dci_root_ctrl_done);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_root_ctrl_methods =
@@ -2325,7 +2281,6 @@ at91dci_root_intr_close(struct usb2_xfer *xfer)
 		sc->sc_root_intr.xfer = NULL;
 	}
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2340,7 +2295,6 @@ at91dci_root_intr_start(struct usb2_xfer *xfer)
 	struct at91dci_softc *sc = xfer->usb2_sc;
 
 	sc->sc_root_intr.xfer = xfer;
-	return;
 }
 
 struct usb2_pipe_methods at91dci_root_intr_methods =
@@ -2465,7 +2419,6 @@ at91dci_xfer_setup(struct usb2_setup_params *parm)
 	}
 
 	xfer->td_start[0] = last_obj;
-	return;
 }
 
 static void
@@ -2530,7 +2483,6 @@ at91dci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *ede
 			break;
 		}
 	}
-	return;
 }
 
 struct usb2_bus_methods at91dci_bus_methods =
diff --git a/sys/dev/usb2/controller/at91dci_atmelarm.c b/sys/dev/usb2/controller/at91dci_atmelarm.c
index dd01773..d0772fe 100644
--- a/sys/dev/usb2/controller/at91dci_atmelarm.c
+++ b/sys/dev/usb2/controller/at91dci_atmelarm.c
@@ -87,7 +87,6 @@ at91_vbus_interrupt(struct at91_udp_softc *sc)
 	vbus_val = at91_pio_gpio_get(VBUS_BASE, VBUS_MASK);
 	(sc->sc_dci.sc_bus.methods->vbus_interrupt)
 	    (&sc->sc_dci.sc_bus, vbus_val);
-	return;
 }
 
 static void
@@ -97,7 +96,6 @@ at91_udp_clocks_on(void *arg)
 
 	at91_pmc_clock_enable(sc->sc_iclk);
 	at91_pmc_clock_enable(sc->sc_fclk);
-	return;
 }
 
 static void
@@ -107,21 +105,18 @@ at91_udp_clocks_off(void *arg)
 
 	at91_pmc_clock_disable(sc->sc_fclk);
 	at91_pmc_clock_disable(sc->sc_iclk);
-	return;
 }
 
 static void
 at91_udp_pull_up(void *arg)
 {
 	at91_pio_gpio_set(PULLUP_BASE, PULLUP_MASK);
-	return;
 }
 
 static void
 at91_udp_pull_down(void *arg)
 {
 	at91_pio_gpio_clear(PULLUP_BASE, PULLUP_MASK);
-	return;
 }
 
 static int
diff --git a/sys/dev/usb2/controller/ehci2.c b/sys/dev/usb2/controller/ehci2.c
index f84f5ad..c514200 100644
--- a/sys/dev/usb2/controller/ehci2.c
+++ b/sys/dev/usb2/controller/ehci2.c
@@ -152,7 +152,6 @@ ehci_iterate_hw_softc(struct usb2_bus *bus, usb2_bus_mem_sub_cb_t *cb)
 		    sc->sc_hw.isoc_fs_start_pg + i,
 		    sizeof(ehci_sitd_t), EHCI_SITD_ALIGN);
 	}
-	return;
 }
 
 static usb2_error_t
@@ -509,8 +508,6 @@ ehci_detach(struct ehci_softc *sc)
 	USB_BUS_UNLOCK(&sc->sc_bus);
 
 	usb2_callout_drain(&sc->sc_tmo_pcd);
-
-	return;
 }
 
 void
@@ -565,7 +562,6 @@ ehci_suspend(struct ehci_softc *sc)
 		    "config timeout\n");
 	}
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 void
@@ -632,8 +628,6 @@ ehci_resume(struct ehci_softc *sc)
 
 	/* catch any lost interrupts */
 	ehci_do_poll(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -727,7 +721,6 @@ ehci_dump_regs(ehci_softc_t *sc)
 		printf("port %d status=0x%08x\n", i,
 		    EOREAD4(sc, EHCI_PORTSC(i)));
 	}
-	return;
 }
 
 static void
@@ -757,7 +750,6 @@ ehci_dump_link(uint32_t link, int type)
 		}
 		printf(">");
 	}
-	return;
 }
 
 static void
@@ -793,7 +785,6 @@ ehci_dump_qtd(ehci_qtd_t *qtd)
 		printf("  buffer_hi[%d]=0x%08x\n", s,
 		    le32toh(qtd->qtd_buffer_hi[s]));
 	}
-	return;
 }
 
 static uint8_t
@@ -821,7 +812,6 @@ ehci_dump_sqtds(ehci_qtd_t *sqtd)
 	if (sqtd) {
 		printf("dump aborted, too many TDs\n");
 	}
-	return;
 }
 
 static void
@@ -854,7 +844,6 @@ ehci_dump_sqh(ehci_qh_t *qh)
 	printf("\n");
 	printf("Overlay qTD:\n");
 	ehci_dump_qtd((void *)&qh->qh_qtd);
-	return;
 }
 
 static void
@@ -881,7 +870,6 @@ ehci_dump_sitd(ehci_sitd_t *sitd)
 	    le32toh(sitd->sitd_bp[1]),
 	    le32toh(sitd->sitd_bp_hi[0]),
 	    le32toh(sitd->sitd_bp_hi[1]));
-	return;
 }
 
 static void
@@ -929,7 +917,6 @@ ehci_dump_itd(ehci_itd_t *itd)
 	    le32toh(itd->itd_bp_hi[4]),
 	    le32toh(itd->itd_bp_hi[5]),
 	    le32toh(itd->itd_bp_hi[6]));
-	return;
 }
 
 static void
@@ -958,7 +945,6 @@ ehci_dump_isoc(ehci_softc_t *sc)
 		ehci_dump_sitd(sitd);
 		sitd = sitd->prev;
 	}
-	return;
 }
 
 #endif
@@ -977,7 +963,6 @@ ehci_transfer_intr_enqueue(struct usb2_xfer *xfer)
 	if (xfer->timeout != 0) {
 		usb2_transfer_timeout_ms(xfer, &ehci_timeout, xfer->timeout);
 	}
-	return;
 }
 
 #define	EHCI_APPEND_FS_TD(std,last) (last) = _ehci_append_fs_td(std,last)
@@ -1285,7 +1270,6 @@ ehci_non_isoc_done(struct usb2_xfer *xfer)
 	}
 done:
 	ehci_device_done(xfer, err);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1429,7 +1413,6 @@ ehci_pcd_enable(ehci_softc_t *sc)
 	    &ehci_root_intr_done);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 static void
@@ -1447,7 +1430,6 @@ repeat:
 			goto repeat;
 		}
 	}
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1520,7 +1502,6 @@ ehci_interrupt(ehci_softc_t *sc)
 
 done:
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 /*
@@ -1540,8 +1521,6 @@ ehci_timeout(void *arg)
 	ehci_device_done(xfer, USB_ERR_TIMEOUT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1553,7 +1532,6 @@ ehci_do_poll(struct usb2_bus *bus)
 	ehci_interrupt_poll(sc);
 	ehci_root_ctrl_poll(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 static void
@@ -1726,8 +1704,6 @@ restart:
 	}
 	temp->td = td;
 	temp->td_next = td_next;
-
-	return;
 }
 
 static void
@@ -1956,7 +1932,6 @@ ehci_setup_standard_chain(struct usb2_xfer *xfer, ehci_qh_t **qh_last)
 	usb2_pc_cpu_flush(qh->page_cache);
 
 	EHCI_APPEND_QH(qh, *qh_last);
-	return;
 }
 
 static void
@@ -2048,8 +2023,6 @@ ehci_isoc_fs_done(ehci_softc_t *sc, struct usb2_xfer *xfer)
 	}
 
 	xfer->aframes = xfer->nframes;
-
-	return;
 }
 
 static void
@@ -2113,8 +2086,6 @@ ehci_isoc_hs_done(ehci_softc_t *sc, struct usb2_xfer *xfer)
 		}
 	}
 	xfer->aframes = xfer->nframes;
-
-	return;
 }
 
 /* NOTE: "done" can be run two times in a row,
@@ -2165,7 +2136,6 @@ ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error)
 	}
 	/* dequeue transfer and start next transfer */
 	usb2_transfer_done(xfer, error);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -2181,7 +2151,6 @@ static void
 ehci_device_bulk_close(struct usb2_xfer *xfer)
 {
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2200,7 +2169,6 @@ ehci_device_bulk_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	ehci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ehci_device_bulk_methods =
@@ -2226,7 +2194,6 @@ static void
 ehci_device_ctrl_close(struct usb2_xfer *xfer)
 {
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2245,7 +2212,6 @@ ehci_device_ctrl_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	ehci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ehci_device_ctrl_methods =
@@ -2312,7 +2278,6 @@ ehci_device_intr_open(struct usb2_xfer *xfer)
 
 	DPRINTFN(3, "best=%d interval=%d\n",
 	    best, xfer->interval);
-	return;
 }
 
 static void
@@ -2327,7 +2292,6 @@ ehci_device_intr_close(struct usb2_xfer *xfer)
 	sc->sc_intr_stat[xfer->qh_pos]--;
 
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2346,7 +2310,6 @@ ehci_device_intr_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	ehci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ehci_device_intr_methods =
@@ -2400,14 +2363,12 @@ ehci_device_isoc_fs_open(struct usb2_xfer *xfer)
 			usb2_pc_cpu_flush(td->page_cache);
 		}
 	}
-	return;
 }
 
 static void
 ehci_device_isoc_fs_close(struct usb2_xfer *xfer)
 {
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2626,8 +2587,6 @@ ehci_device_isoc_fs_enter(struct usb2_xfer *xfer)
 	/* update isoc_next */
 	xfer->pipe->isoc_next = (pp_last - &sc->sc_isoc_fs_p_last[0]) &
 	    (EHCI_VIRTUAL_FRAMELIST_COUNT - 1);
-
-	return;
 }
 
 static void
@@ -2635,7 +2594,6 @@ ehci_device_isoc_fs_start(struct usb2_xfer *xfer)
 {
 	/* put transfer on interrupt queue */
 	ehci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ehci_device_isoc_fs_methods =
@@ -2695,14 +2653,12 @@ ehci_device_isoc_hs_open(struct usb2_xfer *xfer)
 			usb2_pc_cpu_flush(td->page_cache);
 		}
 	}
-	return;
 }
 
 static void
 ehci_device_isoc_hs_close(struct usb2_xfer *xfer)
 {
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2898,8 +2854,6 @@ ehci_device_isoc_hs_enter(struct usb2_xfer *xfer)
 	/* update isoc_next */
 	xfer->pipe->isoc_next = (pp_last - &sc->sc_isoc_hs_p_last[0]) &
 	    (EHCI_VIRTUAL_FRAMELIST_COUNT - 1);
-
-	return;
 }
 
 static void
@@ -2907,7 +2861,6 @@ ehci_device_isoc_hs_start(struct usb2_xfer *xfer)
 {
 	/* put transfer on interrupt queue */
 	ehci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ehci_device_isoc_hs_methods =
@@ -2942,7 +2895,6 @@ ehci_root_ctrl_close(struct usb2_xfer *xfer)
 		sc->sc_root_ctrl.xfer = NULL;
 	}
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 /* data structures and routines
@@ -3052,8 +3004,6 @@ ehci_root_ctrl_start(struct usb2_xfer *xfer)
 
 	usb2_config_td_queue_command
 	    (&sc->sc_config_td, NULL, &ehci_root_ctrl_task, 0, 0);
-
-	return;
 }
 
 static void
@@ -3061,7 +3011,6 @@ ehci_root_ctrl_task(struct ehci_softc *sc,
     struct usb2_config_td_cc *cc, uint16_t refcount)
 {
 	ehci_root_ctrl_poll(sc);
-	return;
 }
 
 static void
@@ -3459,7 +3408,6 @@ ehci_root_ctrl_poll(struct ehci_softc *sc)
 {
 	usb2_sw_transfer(&sc->sc_root_ctrl,
 	    &ehci_root_ctrl_done);
-	return;
 }
 
 struct usb2_pipe_methods ehci_root_ctrl_methods =
@@ -3490,7 +3438,6 @@ ehci_root_intr_close(struct usb2_xfer *xfer)
 		sc->sc_root_intr.xfer = NULL;
 	}
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -3505,7 +3452,6 @@ ehci_root_intr_start(struct usb2_xfer *xfer)
 	ehci_softc_t *sc = xfer->usb2_sc;
 
 	sc->sc_root_intr.xfer = xfer;
-	return;
 }
 
 struct usb2_pipe_methods ehci_root_intr_methods =
@@ -3772,7 +3718,6 @@ alloc_dma_set:
 		xfer->flags_int.curr_dma_set = 1;
 		goto alloc_dma_set;
 	}
-	return;
 }
 
 static void
@@ -3853,7 +3798,6 @@ ehci_get_dma_delay(struct usb2_bus *bus, uint32_t *pus)
 	 * the transfer descriptor(s) and QH
 	 */
 	*pus = (188);			/* microseconds */
-	return;
 }
 
 struct usb2_bus_methods ehci_bus_methods =
diff --git a/sys/dev/usb2/controller/ehci2_pci.c b/sys/dev/usb2/controller/ehci2_pci.c
index 2d33cb0..41b5c2c 100644
--- a/sys/dev/usb2/controller/ehci2_pci.c
+++ b/sys/dev/usb2/controller/ehci2_pci.c
@@ -468,7 +468,6 @@ ehci_pci_takecontroller(device_t self)
 			usb2_pause_mtx(NULL, 10);	/* wait 10ms */
 		}
 	}
-	return;
 }
 
 static driver_t ehci_driver =
diff --git a/sys/dev/usb2/controller/musb2_otg.c b/sys/dev/usb2/controller/musb2_otg.c
index 2b3b94a..fc839bb 100644
--- a/sys/dev/usb2/controller/musb2_otg.c
+++ b/sys/dev/usb2/controller/musb2_otg.c
@@ -133,7 +133,6 @@ musbotg_get_hw_ep_profile(struct usb2_device *udev,
 	} else {
 		*ppf = NULL;
 	}
-	return;
 }
 
 static void
@@ -151,7 +150,6 @@ musbotg_clocks_on(struct musbotg_softc *sc)
 
 		/* XXX enable Transceiver */
 	}
-	return;
 }
 
 static void
@@ -168,7 +166,6 @@ musbotg_clocks_off(struct musbotg_softc *sc)
 		}
 		sc->sc_flags.clocks_off = 1;
 	}
-	return;
 }
 
 static void
@@ -183,7 +180,6 @@ musbotg_pull_common(struct musbotg_softc *sc, uint8_t on)
 		temp &= ~MUSB2_MASK_SOFTC;
 
 	MUSB2_WRITE_1(sc, MUSB2_REG_POWER, temp);
-	return;
 }
 
 static void
@@ -196,7 +192,6 @@ musbotg_pull_up(struct musbotg_softc *sc)
 		sc->sc_flags.d_pulled_up = 1;
 		musbotg_pull_common(sc, 1);
 	}
-	return;
 }
 
 static void
@@ -208,7 +203,6 @@ musbotg_pull_down(struct musbotg_softc *sc)
 		sc->sc_flags.d_pulled_up = 0;
 		musbotg_pull_common(sc, 0);
 	}
-	return;
 }
 
 static void
@@ -239,14 +233,12 @@ musbotg_wakeup_peer(struct usb2_xfer *xfer)
 	temp = MUSB2_READ_1(sc, MUSB2_REG_POWER);
 	temp &= ~MUSB2_MASK_RESUME;
 	MUSB2_WRITE_1(sc, MUSB2_REG_POWER, temp);
-	return;
 }
 
 static void
 musbotg_rem_wakeup_set(struct usb2_device *udev, uint8_t is_on)
 {
 	DPRINTFN(4, "is_on=%u\n", is_on);
-	return;
 }
 
 static void
@@ -255,7 +247,6 @@ musbotg_set_address(struct musbotg_softc *sc, uint8_t addr)
 	DPRINTFN(4, "addr=%d\n", addr);
 	addr &= 0x7F;
 	MUSB2_WRITE_1(sc, MUSB2_REG_FADDR, addr);
-	return;
 }
 
 static uint8_t
@@ -971,8 +962,6 @@ repeat:
 			goto repeat;
 		}
 	}
-
-	return;
 }
 
 static void
@@ -1008,8 +997,6 @@ musbotg_vbus_interrupt(struct usb2_bus *bus, uint8_t is_on)
 	}
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -1117,8 +1104,6 @@ repeat:
 		goto repeat;
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1142,7 +1127,6 @@ musbotg_setup_standard_chain_sub(struct musbotg_std_temp *temp)
 	td->did_stall = 0;
 	td->short_pkt = temp->short_pkt;
 	td->alt_next = temp->setup_alt_next;
-	return;
 }
 
 static void
@@ -1262,7 +1246,6 @@ musbotg_setup_standard_chain(struct usb2_xfer *xfer)
 	/* must have at least one frame! */
 	td = temp.td;
 	xfer->td_transfer_last = td;
-	return;
 }
 
 static void
@@ -1279,8 +1262,6 @@ musbotg_timeout(void *arg)
 	musbotg_device_done(xfer, USB_ERR_TIMEOUT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1321,7 +1302,6 @@ musbotg_ep_int_set(struct usb2_xfer *xfer, uint8_t on)
 			MUSB2_WRITE_2(sc, MUSB2_REG_INTTXE, temp);
 		}
 	}
-	return;
 }
 
 static void
@@ -1345,7 +1325,6 @@ musbotg_start_standard_chain(struct usb2_xfer *xfer)
 			    &musbotg_timeout, xfer->timeout);
 		}
 	}
-	return;
 }
 
 static void
@@ -1481,7 +1460,6 @@ musbotg_standard_done(struct usb2_xfer *xfer)
 	}
 done:
 	musbotg_device_done(xfer, err);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1506,7 +1484,6 @@ musbotg_device_done(struct usb2_xfer *xfer, usb2_error_t error)
 	}
 	/* dequeue transfer and start next transfer */
 	usb2_transfer_done(xfer, error);
-	return;
 }
 
 static void
@@ -1539,7 +1516,6 @@ musbotg_set_stall(struct usb2_device *udev, struct usb2_xfer *xfer,
 		MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRL,
 		    MUSB2_MASK_CSRL_RXSENDSTALL);
 	}
-	return;
 }
 
 static void
@@ -1691,7 +1667,6 @@ musbotg_clear_stall_sub(struct musbotg_softc *sc, uint16_t wMaxPacket,
 			MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRL, 0);
 		}
 	}
-	return;
 }
 
 static void
@@ -1721,7 +1696,6 @@ musbotg_clear_stall(struct usb2_device *udev, struct usb2_pipe *pipe)
 	    (ed->bEndpointAddress & UE_ADDR),
 	    (ed->bmAttributes & UE_XFERTYPE),
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
-	return;
 }
 
 usb2_error_t
@@ -1900,8 +1874,6 @@ musbotg_uninit(struct musbotg_softc *sc)
 	musbotg_pull_down(sc);
 	musbotg_clocks_off(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -1925,7 +1897,6 @@ musbotg_do_poll(struct usb2_bus *bus)
 	musbotg_interrupt_poll(sc);
 	musbotg_root_ctrl_poll(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1941,7 +1912,6 @@ static void
 musbotg_device_bulk_close(struct usb2_xfer *xfer)
 {
 	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1956,7 +1926,6 @@ musbotg_device_bulk_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	musbotg_setup_standard_chain(xfer);
 	musbotg_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods musbotg_device_bulk_methods =
@@ -1982,7 +1951,6 @@ static void
 musbotg_device_ctrl_close(struct usb2_xfer *xfer)
 {
 	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1997,7 +1965,6 @@ musbotg_device_ctrl_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	musbotg_setup_standard_chain(xfer);
 	musbotg_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods musbotg_device_ctrl_methods =
@@ -2023,7 +1990,6 @@ static void
 musbotg_device_intr_close(struct usb2_xfer *xfer)
 {
 	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2038,7 +2004,6 @@ musbotg_device_intr_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	musbotg_setup_standard_chain(xfer);
 	musbotg_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods musbotg_device_intr_methods =
@@ -2064,7 +2029,6 @@ static void
 musbotg_device_isoc_close(struct usb2_xfer *xfer)
 {
 	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2124,7 +2088,6 @@ musbotg_device_isoc_enter(struct usb2_xfer *xfer)
 
 	/* setup TDs */
 	musbotg_setup_standard_chain(xfer);
-	return;
 }
 
 static void
@@ -2132,7 +2095,6 @@ musbotg_device_isoc_start(struct usb2_xfer *xfer)
 {
 	/* start TD chain */
 	musbotg_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods musbotg_device_isoc_methods =
@@ -2166,7 +2128,6 @@ musbotg_root_ctrl_close(struct usb2_xfer *xfer)
 		sc->sc_root_ctrl.xfer = NULL;
 	}
 	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 /*
@@ -2272,8 +2233,6 @@ musbotg_root_ctrl_start(struct usb2_xfer *xfer)
 
 	usb2_config_td_queue_command(
 	    &sc->sc_config_td, NULL, &musbotg_root_ctrl_task, 0, 0);
-
-	return;
 }
 
 static void
@@ -2281,7 +2240,6 @@ musbotg_root_ctrl_task(struct musbotg_softc *sc,
     struct musbotg_config_copy *cc, uint16_t refcount)
 {
 	musbotg_root_ctrl_poll(sc);
-	return;
 }
 
 static void
@@ -2693,7 +2651,6 @@ musbotg_root_ctrl_poll(struct musbotg_softc *sc)
 {
 	usb2_sw_transfer(&sc->sc_root_ctrl,
 	    &musbotg_root_ctrl_done);
-	return;
 }
 
 struct usb2_pipe_methods musbotg_root_ctrl_methods =
@@ -2724,7 +2681,6 @@ musbotg_root_intr_close(struct usb2_xfer *xfer)
 		sc->sc_root_intr.xfer = NULL;
 	}
 	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2739,7 +2695,6 @@ musbotg_root_intr_start(struct usb2_xfer *xfer)
 	struct musbotg_softc *sc = xfer->usb2_sc;
 
 	sc->sc_root_intr.xfer = xfer;
-	return;
 }
 
 struct usb2_pipe_methods musbotg_root_intr_methods =
@@ -2862,7 +2817,6 @@ musbotg_xfer_setup(struct usb2_setup_params *parm)
 	}
 
 	xfer->td_start[0] = last_obj;
-	return;
 }
 
 static void
@@ -2928,7 +2882,6 @@ musbotg_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *ede
 			break;
 		}
 	}
-	return;
 }
 
 struct usb2_bus_methods musbotg_bus_methods =
diff --git a/sys/dev/usb2/controller/musb2_otg_atmelarm.c b/sys/dev/usb2/controller/musb2_otg_atmelarm.c
index 49b653ff..f67de1e 100644
--- a/sys/dev/usb2/controller/musb2_otg_atmelarm.c
+++ b/sys/dev/usb2/controller/musb2_otg_atmelarm.c
@@ -59,7 +59,6 @@ musbotg_vbus_interrupt(struct musbotg_super_softc *sc)
 
 	(sc->sc_otg.sc_bus.methods->vbus_interrupt)
 	    (&sc->sc_otg.sc_bus, vbus_val);
-	return;
 }
 
 static void
@@ -69,8 +68,6 @@ musbotg_clocks_on(void *arg)
 	struct musbotg_super_softc *sc = arg;
 
 #endif
-
-	return;
 }
 
 static void
@@ -80,8 +77,6 @@ musbotg_clocks_off(void *arg)
 	struct musbotg_super_softc *sc = arg;
 
 #endif
-
-	return;
 }
 
 static int
diff --git a/sys/dev/usb2/controller/ohci2.c b/sys/dev/usb2/controller/ohci2.c
index 8ed49d3..5ea465c 100644
--- a/sys/dev/usb2/controller/ohci2.c
+++ b/sys/dev/usb2/controller/ohci2.c
@@ -151,7 +151,6 @@ ohci_iterate_hw_softc(struct usb2_bus *bus, usb2_bus_mem_sub_cb_t *cb)
 		cb(bus, sc->sc_hw.intr_start_pc + i, sc->sc_hw.intr_start_pg + i,
 		    sizeof(ohci_ed_t), OHCI_ED_ALIGN);
 	}
-	return;
 }
 
 static usb2_error_t
@@ -437,8 +436,6 @@ ohci_detach(struct ohci_softc *sc)
 	USB_BUS_UNLOCK(&sc->sc_bus);
 
 	usb2_callout_drain(&sc->sc_tmo_rhsc);
-
-	return;
 }
 
 /* NOTE: suspend/resume is called from
@@ -474,7 +471,6 @@ ohci_suspend(ohci_softc_t *sc)
 	    USB_RESUME_WAIT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 void
@@ -513,8 +509,6 @@ ohci_resume(ohci_softc_t *sc)
 
 	/* catch any lost interrupts */
 	ohci_do_poll(&sc->sc_bus);
-
-	return;
 }
 
 #if USB_DEBUG
@@ -560,7 +554,6 @@ ohci_dumpregs(ohci_softc_t *sc)
 	DPRINTF("         HCCA: frame_number=0x%04x done_head=0x%08x\n",
 	    le32toh(hcca->hcca_frame_number),
 	    le32toh(hcca->hcca_done_head));
-	return;
 }
 static void
 ohci_dump_tds(ohci_td_t *std)
@@ -570,7 +563,6 @@ ohci_dump_tds(ohci_td_t *std)
 			break;
 		}
 	}
-	return;
 }
 
 static uint8_t
@@ -641,7 +633,6 @@ ohci_dump_itds(ohci_itd_t *sitd)
 			break;
 		}
 	}
-	return;
 }
 
 static void
@@ -671,7 +662,6 @@ ohci_dump_ed(ohci_ed_t *sed)
 	    (ed_headp & OHCI_TOGGLECARRY) ? "-CARRY" : "",
 	    le32toh(sed->ed_headp),
 	    le32toh(sed->ed_next));
-	return;
 }
 
 #endif
@@ -690,7 +680,6 @@ ohci_transfer_intr_enqueue(struct usb2_xfer *xfer)
 	if (xfer->timeout != 0) {
 		usb2_transfer_timeout_ms(xfer, &ohci_timeout, xfer->timeout);
 	}
-	return;
 }
 
 #define	OHCI_APPEND_QH(sed,td_self,last) (last) = _ohci_append_qh(sed,td_self,last)
@@ -811,7 +800,6 @@ ohci_isoc_done(struct usb2_xfer *xfer)
 
 	xfer->aframes = xfer->nframes;
 	ohci_device_done(xfer, USB_ERR_NORMAL_COMPLETION);
-	return;
 }
 
 #if USB_DEBUG
@@ -973,7 +961,6 @@ ohci_non_isoc_done(struct usb2_xfer *xfer)
 	}
 done:
 	ohci_device_done(xfer, err);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1037,7 +1024,6 @@ ohci_check_transfer_sub(struct usb2_xfer *xfer)
 
 		DPRINTFN(13, "xfer=%p following alt next\n", xfer);
 	}
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1111,7 +1097,6 @@ ohci_rhsc_enable(ohci_softc_t *sc)
 	    &ohci_root_intr_done);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 static void
@@ -1129,7 +1114,6 @@ repeat:
 			goto repeat;
 		}
 	}
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1247,7 +1231,6 @@ ohci_interrupt(ohci_softc_t *sc)
 
 done:
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 /*
@@ -1267,8 +1250,6 @@ ohci_timeout(void *arg)
 	ohci_device_done(xfer, USB_ERR_TIMEOUT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1280,7 +1261,6 @@ ohci_do_poll(struct usb2_bus *bus)
 	ohci_interrupt_poll(sc);
 	ohci_root_ctrl_poll(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 static void
@@ -1423,8 +1403,6 @@ restart:
 	}
 	temp->td = td;
 	temp->td_next = td_next;
-
-	return;
 }
 
 static void
@@ -1605,7 +1583,6 @@ ohci_setup_standard_chain(struct usb2_xfer *xfer, ohci_ed_t **ed_last)
 
 		OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF);
 	}
-	return;
 }
 
 static void
@@ -1690,7 +1667,6 @@ ohci_device_done(struct usb2_xfer *xfer, usb2_error_t error)
 
 	/* dequeue transfer and start next transfer */
 	usb2_transfer_done(xfer, error);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1706,7 +1682,6 @@ static void
 ohci_device_bulk_close(struct usb2_xfer *xfer)
 {
 	ohci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1725,7 +1700,6 @@ ohci_device_bulk_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	ohci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ohci_device_bulk_methods =
@@ -1751,7 +1725,6 @@ static void
 ohci_device_ctrl_close(struct usb2_xfer *xfer)
 {
 	ohci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1770,7 +1743,6 @@ ohci_device_ctrl_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	ohci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ohci_device_ctrl_methods =
@@ -1817,7 +1789,6 @@ ohci_device_intr_open(struct usb2_xfer *xfer)
 
 	DPRINTFN(3, "best=%d interval=%d\n",
 	    best, xfer->interval);
-	return;
 }
 
 static void
@@ -1828,7 +1799,6 @@ ohci_device_intr_close(struct usb2_xfer *xfer)
 	sc->sc_intr_stat[xfer->qh_pos]--;
 
 	ohci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1847,7 +1817,6 @@ ohci_device_intr_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	ohci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ohci_device_intr_methods =
@@ -1874,7 +1843,6 @@ ohci_device_isoc_close(struct usb2_xfer *xfer)
 {
 	/**/
 	ohci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2049,7 +2017,6 @@ ohci_device_isoc_enter(struct usb2_xfer *xfer)
 	td = xfer->td_transfer_first;
 
 	OHCI_APPEND_QH(ed, td->itd_self, sc->sc_isoc_p_last);
-	return;
 }
 
 static void
@@ -2057,7 +2024,6 @@ ohci_device_isoc_start(struct usb2_xfer *xfer)
 {
 	/* put transfer on interrupt queue */
 	ohci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods ohci_device_isoc_methods =
@@ -2092,7 +2058,6 @@ ohci_root_ctrl_close(struct usb2_xfer *xfer)
 		sc->sc_root_ctrl.xfer = NULL;
 	}
 	ohci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 /* data structures and routines
@@ -2173,8 +2138,6 @@ ohci_root_ctrl_start(struct usb2_xfer *xfer)
 
 	usb2_config_td_queue_command
 	    (&sc->sc_config_td, NULL, &ohci_root_ctrl_task, 0, 0);
-
-	return;
 }
 
 static void
@@ -2182,7 +2145,6 @@ ohci_root_ctrl_task(struct ohci_softc *sc,
     struct ohci_config_copy *cc, uint16_t refcount)
 {
 	ohci_root_ctrl_poll(sc);
-	return;
 }
 
 static void
@@ -2493,7 +2455,6 @@ ohci_root_ctrl_poll(struct ohci_softc *sc)
 {
 	usb2_sw_transfer(&sc->sc_root_ctrl,
 	    &ohci_root_ctrl_done);
-	return;
 }
 
 struct usb2_pipe_methods ohci_root_ctrl_methods =
@@ -2524,7 +2485,6 @@ ohci_root_intr_close(struct usb2_xfer *xfer)
 		sc->sc_root_intr.xfer = NULL;
 	}
 	ohci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2539,7 +2499,6 @@ ohci_root_intr_start(struct usb2_xfer *xfer)
 	ohci_softc_t *sc = xfer->usb2_sc;
 
 	sc->sc_root_intr.xfer = xfer;
-	return;
 }
 
 struct usb2_pipe_methods ohci_root_intr_methods =
@@ -2719,7 +2678,6 @@ alloc_dma_set:
 		xfer->flags_int.curr_dma_set = 1;
 		goto alloc_dma_set;
 	}
-	return;
 }
 
 static void
@@ -2772,7 +2730,6 @@ ohci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc,
 			break;
 		}
 	}
-	return;
 }
 
 static void
@@ -2789,7 +2746,6 @@ ohci_get_dma_delay(struct usb2_bus *bus, uint32_t *pus)
 	 * transfer descriptor(s) and QH
 	 */
 	*pus = (1125);			/* microseconds */
-	return;
 }
 
 struct usb2_bus_methods ohci_bus_methods =
diff --git a/sys/dev/usb2/controller/uhci2.c b/sys/dev/usb2/controller/uhci2.c
index ae03b8d..ceb87e6 100644
--- a/sys/dev/usb2/controller/uhci2.c
+++ b/sys/dev/usb2/controller/uhci2.c
@@ -182,7 +182,6 @@ uhci_iterate_hw_softc(struct usb2_bus *bus, usb2_bus_mem_sub_cb_t *cb)
 		    sc->sc_hw.intr_start_pg + i,
 		    sizeof(uhci_qh_t), UHCI_QH_ALIGN);
 	}
-	return;
 }
 
 static void
@@ -194,8 +193,6 @@ uhci_mem_layout_init(struct uhci_mem_layout *ml, struct usb2_xfer *xfer)
 	ml->buf_offset = 0;
 
 	ml->max_frame_size = xfer->max_frame_size;
-
-	return;
 }
 
 static void
@@ -255,8 +252,6 @@ uhci_mem_layout_fixup(struct uhci_mem_layout *ml, struct uhci_td *td)
 	/* prepare next data location */
 
 	ml->buf_offset += td->len;
-
-	return;
 }
 
 void
@@ -326,7 +321,6 @@ done_2:
 	UWRITE4(sc, UHCI_FLBASEADDR, buf_res.physaddr);
 	UWRITE2(sc, UHCI_FRNUM, sc->sc_saved_frnum);
 	UWRITE1(sc, UHCI_SOF, sc->sc_saved_sof);
-	return;
 }
 
 static void
@@ -651,7 +645,6 @@ uhci_suspend(uhci_softc_t *sc)
 	usb2_pause_mtx(&sc->sc_bus.bus_mtx, USB_RESUME_WAIT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 void
@@ -684,8 +677,6 @@ uhci_resume(uhci_softc_t *sc)
 
 	/* catch lost interrupts */
 	uhci_do_poll(&sc->sc_bus);
-
-	return;
 }
 
 #if USB_DEBUG
@@ -703,7 +694,6 @@ uhci_dumpregs(uhci_softc_t *sc)
 	    UREAD1(sc, UHCI_SOF),
 	    UREAD2(sc, UHCI_PORTSC1),
 	    UREAD2(sc, UHCI_PORTSC2));
-	return;
 }
 
 static uint8_t
@@ -792,7 +782,6 @@ uhci_dump_all(uhci_softc_t *sc)
 	uhci_dump_qh(sc->sc_fs_ctl_p_last);
 	uhci_dump_qh(sc->sc_bulk_p_last);
 	uhci_dump_qh(sc->sc_last_qh_p);
-	return;
 }
 
 static void
@@ -820,8 +809,6 @@ uhci_dump_qhs(uhci_qh_t *sqh)
 		uhci_dump_tds(sqh->e_next);
 	else
 		DPRINTF("No TD\n");
-
-	return;
 }
 
 static void
@@ -834,7 +821,6 @@ uhci_dump_tds(uhci_td_t *td)
 			break;
 		}
 	}
-	return;
 }
 
 #endif
@@ -867,7 +853,6 @@ uhci_add_loop(uhci_softc_t *sc)
 		qh_lst->qh_h_next = qh_rec->qh_self;
 		usb2_pc_cpu_flush(qh_lst->page_cache);
 	}
-	return;
 }
 
 static void
@@ -887,7 +872,6 @@ uhci_rem_loop(uhci_softc_t *sc)
 		qh_lst->qh_h_next = htole32(UHCI_PTR_T);
 		usb2_pc_cpu_flush(qh_lst->page_cache);
 	}
-	return;
 }
 
 static void
@@ -904,7 +888,6 @@ uhci_transfer_intr_enqueue(struct usb2_xfer *xfer)
 	if (xfer->timeout != 0) {
 		usb2_transfer_timeout_ms(xfer, &uhci_timeout, xfer->timeout);
 	}
-	return;
 }
 
 #define	UHCI_APPEND_TD(std,last) (last) = _uhci_append_td(std,last)
@@ -1088,8 +1071,6 @@ uhci_isoc_done(uhci_softc_t *sc, struct usb2_xfer *xfer)
 	}
 
 	xfer->aframes = xfer->nframes;
-
-	return;
 }
 
 static usb2_error_t
@@ -1255,7 +1236,6 @@ uhci_non_isoc_done(struct usb2_xfer *xfer)
 	}
 done:
 	uhci_device_done(xfer, err);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1312,7 +1292,6 @@ uhci_check_transfer_sub(struct usb2_xfer *xfer)
 	usb2_pc_cpu_flush(qh->page_cache);
 
 	DPRINTFN(13, "xfer=%p following alt next\n", xfer);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1433,7 +1412,6 @@ repeat:
 			goto repeat;
 		}
 	}
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1507,7 +1485,6 @@ uhci_interrupt(uhci_softc_t *sc)
 
 done:
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 /*
@@ -1527,8 +1504,6 @@ uhci_timeout(void *arg)
 	uhci_device_done(xfer, USB_ERR_TIMEOUT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1540,7 +1515,6 @@ uhci_do_poll(struct usb2_bus *bus)
 	uhci_interrupt_poll(sc);
 	uhci_root_ctrl_poll(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 static void
@@ -1684,8 +1658,6 @@ restart:
 	}
 	temp->td = td;
 	temp->td_next = td_next;
-
-	return;
 }
 
 static uhci_td_t *
@@ -1902,7 +1874,6 @@ uhci_device_done(struct usb2_xfer *xfer, usb2_error_t error)
 	}
 	/* dequeue transfer and start next transfer */
 	usb2_transfer_done(xfer, error);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1918,7 +1889,6 @@ static void
 uhci_device_bulk_close(struct usb2_xfer *xfer)
 {
 	uhci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1946,7 +1916,6 @@ uhci_device_bulk_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	uhci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uhci_device_bulk_methods =
@@ -1972,7 +1941,6 @@ static void
 uhci_device_ctrl_close(struct usb2_xfer *xfer)
 {
 	uhci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2005,7 +1973,6 @@ uhci_device_ctrl_start(struct usb2_xfer *xfer)
 	}
 	/* put transfer on interrupt queue */
 	uhci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uhci_device_ctrl_methods =
@@ -2052,7 +2019,6 @@ uhci_device_intr_open(struct usb2_xfer *xfer)
 
 	DPRINTFN(3, "best=%d interval=%d\n",
 	    best, xfer->interval);
-	return;
 }
 
 static void
@@ -2063,7 +2029,6 @@ uhci_device_intr_close(struct usb2_xfer *xfer)
 	sc->sc_intr_stat[xfer->qh_pos]--;
 
 	uhci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2090,7 +2055,6 @@ uhci_device_intr_start(struct usb2_xfer *xfer)
 
 	/* put transfer on interrupt queue */
 	uhci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uhci_device_intr_methods =
@@ -2133,14 +2097,12 @@ uhci_device_isoc_open(struct usb2_xfer *xfer)
 			usb2_pc_cpu_flush(td->page_cache);
 		}
 	}
-	return;
 }
 
 static void
 uhci_device_isoc_close(struct usb2_xfer *xfer)
 {
 	uhci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2296,8 +2258,6 @@ uhci_device_isoc_enter(struct usb2_xfer *xfer)
 	/* update isoc_next */
 	xfer->pipe->isoc_next = (pp_last - &sc->sc_isoc_p_last[0]) &
 	    (UHCI_VFRAMELIST_COUNT - 1);
-
-	return;
 }
 
 static void
@@ -2305,7 +2265,6 @@ uhci_device_isoc_start(struct usb2_xfer *xfer)
 {
 	/* put transfer on interrupt queue */
 	uhci_transfer_intr_enqueue(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uhci_device_isoc_methods =
@@ -2340,7 +2299,6 @@ uhci_root_ctrl_close(struct usb2_xfer *xfer)
 		sc->sc_root_ctrl.xfer = NULL;
 	}
 	uhci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 /* data structures and routines
@@ -2534,8 +2492,6 @@ uhci_root_ctrl_start(struct usb2_xfer *xfer)
 
 	usb2_config_td_queue_command
 	    (&sc->sc_config_td, NULL, &uhci_root_ctrl_task, 0, 0);
-
-	return;
 }
 
 static void
@@ -2543,7 +2499,6 @@ uhci_root_ctrl_task(struct uhci_softc *sc,
     struct uhci_config_copy *cc, uint16_t refcount)
 {
 	uhci_root_ctrl_poll(sc);
-	return;
 }
 
 static void
@@ -2855,7 +2810,6 @@ uhci_root_ctrl_poll(struct uhci_softc *sc)
 {
 	usb2_sw_transfer(&sc->sc_root_ctrl,
 	    &uhci_root_ctrl_done);
-	return;
 }
 
 struct usb2_pipe_methods uhci_root_ctrl_methods =
@@ -2886,7 +2840,6 @@ uhci_root_intr_close(struct usb2_xfer *xfer)
 		sc->sc_root_intr.xfer = NULL;
 	}
 	uhci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2904,7 +2857,6 @@ uhci_root_intr_start(struct usb2_xfer *xfer)
 
 	usb2_transfer_timeout_ms(xfer,
 	    &uhci_root_intr_check, xfer->interval);
-	return;
 }
 
 static void
@@ -2961,7 +2913,6 @@ uhci_root_intr_check(void *arg)
 		    &uhci_root_intr_done);
 	}
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 struct usb2_pipe_methods uhci_root_intr_methods =
@@ -3173,7 +3124,6 @@ alloc_dma_set:
 		xfer->flags_int.curr_dma_set = 1;
 		goto alloc_dma_set;
 	}
-	return;
 }
 
 static void
@@ -3226,7 +3176,6 @@ uhci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc,
 			break;
 		}
 	}
-	return;
 }
 
 static void
@@ -3243,7 +3192,6 @@ uhci_get_dma_delay(struct usb2_bus *bus, uint32_t *pus)
 	 * transfer descriptor(s) and QH
 	 */
 	*pus = (1125);			/* microseconds */
-	return;
 }
 
 struct usb2_bus_methods uhci_bus_methods =
diff --git a/sys/dev/usb2/controller/usb2_controller.c b/sys/dev/usb2/controller/usb2_controller.c
index a9952d2..7c3ea89 100644
--- a/sys/dev/usb2/controller/usb2_controller.c
+++ b/sys/dev/usb2/controller/usb2_controller.c
@@ -207,7 +207,6 @@ usb2_bus_explore(struct usb2_proc_msg *pm)
 
 		USB_BUS_LOCK(bus);
 	}
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -245,7 +244,6 @@ usb2_bus_detach(struct usb2_proc_msg *pm)
 	USB_BUS_LOCK(bus);
 	/* clear bdev variable last */
 	bus->bdev = NULL;
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -331,7 +329,6 @@ usb2_attach_sub(device_t dev, struct usb2_bus *bus)
 	}
 	/* set softc - we are ready */
 	device_set_softc(dev, bus);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -377,8 +374,6 @@ usb2_post_init(void *arg)
 	usb2_needs_explore_all();
 
 	mtx_unlock(&Giant);
-
-	return;
 }
 
 SYSINIT(usb2_post_init, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, usb2_post_init, NULL);
@@ -392,7 +387,6 @@ usb2_bus_mem_flush_all_cb(struct usb2_bus *bus, struct usb2_page_cache *pc,
     struct usb2_page *pg, uint32_t size, uint32_t align)
 {
 	usb2_pc_cpu_flush(pc);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -404,7 +398,6 @@ usb2_bus_mem_flush_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb)
 	if (cb) {
 		cb(bus, &usb2_bus_mem_flush_all_cb);
 	}
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -420,7 +413,6 @@ usb2_bus_mem_alloc_all_cb(struct usb2_bus *bus, struct usb2_page_cache *pc,
 	if (usb2_pc_alloc_mem(pc, pg, size, align)) {
 		bus->alloc_failed = 1;
 	}
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -463,7 +455,6 @@ usb2_bus_mem_free_all_cb(struct usb2_bus *bus, struct usb2_page_cache *pc,
     struct usb2_page *pg, uint32_t size, uint32_t align)
 {
 	usb2_pc_free_mem(pc);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -478,6 +469,4 @@ usb2_bus_mem_free_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb)
 	usb2_dma_tag_unsetup(bus->dma_parent_tag);
 
 	mtx_destroy(&bus->bus_mtx);
-
-	return;
 }
diff --git a/sys/dev/usb2/controller/uss820dci.c b/sys/dev/usb2/controller/uss820dci.c
index c72caaf..7148acc 100644
--- a/sys/dev/usb2/controller/uss820dci.c
+++ b/sys/dev/usb2/controller/uss820dci.c
@@ -157,7 +157,6 @@ uss820dci_update_shared_1(struct uss820dci_softc *sc, uint8_t reg,
 	temp |= (set_mask);
 	USS820_WRITE_1(sc, reg, temp);
 	USS820_WRITE_1(sc, USS820_PEND, 0);
-	return;
 }
 
 static void
@@ -175,7 +174,6 @@ uss820dci_get_hw_ep_profile(struct usb2_device *udev,
 	} else {
 		*ppf = NULL;
 	}
-	return;
 }
 
 static void
@@ -195,7 +193,6 @@ uss820dci_pull_up(struct uss820dci_softc *sc)
 		temp |= USS820_MCSR_DPEN;
 		USS820_WRITE_1(sc, USS820_MCSR, temp);
 	}
-	return;
 }
 
 static void
@@ -214,7 +211,6 @@ uss820dci_pull_down(struct uss820dci_softc *sc)
 		temp &= ~USS820_MCSR_DPEN;
 		USS820_WRITE_1(sc, USS820_MCSR, temp);
 	}
-	return;
 }
 
 static void
@@ -224,8 +220,6 @@ uss820dci_wakeup_peer(struct uss820dci_softc *sc)
 		return;
 	}
 	DPRINTFN(0, "not supported\n");
-
-	return;
 }
 
 static void
@@ -249,8 +243,6 @@ uss820dci_rem_wakeup_set(struct usb2_device *udev, uint8_t is_on)
 	}
 
 	USS820_WRITE_1(sc, USS820_SCR, temp);
-
-	return;
 }
 
 static void
@@ -259,8 +251,6 @@ uss820dci_set_address(struct uss820dci_softc *sc, uint8_t addr)
 	DPRINTFN(5, "addr=%d\n", addr);
 
 	USS820_WRITE_1(sc, USS820_FADDR, addr);
-
-	return;
 }
 
 static uint8_t
@@ -725,7 +715,6 @@ repeat:
 			goto repeat;
 		}
 	}
-	return;
 }
 
 static void
@@ -747,7 +736,6 @@ uss820dci_wait_suspend(struct uss820dci_softc *sc, uint8_t on)
 
 	USS820_WRITE_1(sc, USS820_SCR, scr);
 	USS820_WRITE_1(sc, USS820_SCRATCH, scratch);
-	return;
 }
 
 void
@@ -828,8 +816,6 @@ uss820dci_interrupt(struct uss820dci_softc *sc)
 	uss820dci_interrupt_poll(sc);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -853,7 +839,6 @@ uss820dci_setup_standard_chain_sub(struct uss820_std_temp *temp)
 	td->did_stall = 0;
 	td->short_pkt = temp->short_pkt;
 	td->alt_next = temp->setup_alt_next;
-	return;
 }
 
 static void
@@ -982,8 +967,6 @@ uss820dci_setup_standard_chain(struct usb2_xfer *xfer)
 	/* must have at least one frame! */
 	td = temp.td;
 	xfer->td_transfer_last = td;
-
-	return;
 }
 
 static void
@@ -1000,8 +983,6 @@ uss820dci_timeout(void *arg)
 	uss820dci_device_done(xfer, USB_ERR_TIMEOUT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1041,7 +1022,6 @@ uss820dci_intr_set(struct usb2_xfer *xfer, uint8_t set)
 		temp &= ~ep_no;
 	}
 	USS820_WRITE_1(sc, ep_reg, temp);
-	return;
 }
 
 static void
@@ -1068,7 +1048,6 @@ uss820dci_start_standard_chain(struct usb2_xfer *xfer)
 			    &uss820dci_timeout, xfer->timeout);
 		}
 	}
-	return;
 }
 
 static void
@@ -1204,7 +1183,6 @@ uss820dci_standard_done(struct usb2_xfer *xfer)
 	}
 done:
 	uss820dci_device_done(xfer, err);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1226,7 +1204,6 @@ uss820dci_device_done(struct usb2_xfer *xfer, usb2_error_t error)
 	}
 	/* dequeue transfer and start next transfer */
 	usb2_transfer_done(xfer, error);
-	return;
 }
 
 static void
@@ -1265,7 +1242,6 @@ uss820dci_set_stall(struct usb2_device *udev, struct usb2_xfer *xfer,
 		temp = USS820_EPCON_RXSTL;
 	}
 	uss820dci_update_shared_1(sc, USS820_EPCON, 0xFF, temp);
-	return;
 }
 
 static void
@@ -1316,7 +1292,6 @@ uss820dci_clear_stall_sub(struct uss820dci_softc *sc,
 		temp &= ~USS820_RXCON_RXCLR;
 		USS820_WRITE_1(sc, USS820_RXCON, temp);
 	}
-	return;
 }
 
 static void
@@ -1345,8 +1320,6 @@ uss820dci_clear_stall(struct usb2_device *udev, struct usb2_pipe *pipe)
 	    (ed->bEndpointAddress & UE_ADDR),
 	    (ed->bmAttributes & UE_XFERTYPE),
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
-
-	return;
 }
 
 usb2_error_t
@@ -1534,8 +1507,6 @@ uss820dci_uninit(struct uss820dci_softc *sc)
 
 	uss820dci_pull_down(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -1559,7 +1530,6 @@ uss820dci_do_poll(struct usb2_bus *bus)
 	uss820dci_interrupt_poll(sc);
 	uss820dci_root_ctrl_poll(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1575,7 +1545,6 @@ static void
 uss820dci_device_bulk_close(struct usb2_xfer *xfer)
 {
 	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1590,7 +1559,6 @@ uss820dci_device_bulk_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	uss820dci_setup_standard_chain(xfer);
 	uss820dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uss820dci_device_bulk_methods =
@@ -1616,7 +1584,6 @@ static void
 uss820dci_device_ctrl_close(struct usb2_xfer *xfer)
 {
 	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1631,7 +1598,6 @@ uss820dci_device_ctrl_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	uss820dci_setup_standard_chain(xfer);
 	uss820dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uss820dci_device_ctrl_methods =
@@ -1657,7 +1623,6 @@ static void
 uss820dci_device_intr_close(struct usb2_xfer *xfer)
 {
 	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1672,7 +1637,6 @@ uss820dci_device_intr_start(struct usb2_xfer *xfer)
 	/* setup TDs */
 	uss820dci_setup_standard_chain(xfer);
 	uss820dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uss820dci_device_intr_methods =
@@ -1698,7 +1662,6 @@ static void
 uss820dci_device_isoc_fs_close(struct usb2_xfer *xfer)
 {
 	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1751,7 +1714,6 @@ uss820dci_device_isoc_fs_enter(struct usb2_xfer *xfer)
 
 	/* setup TDs */
 	uss820dci_setup_standard_chain(xfer);
-	return;
 }
 
 static void
@@ -1759,7 +1721,6 @@ uss820dci_device_isoc_fs_start(struct usb2_xfer *xfer)
 {
 	/* start TD chain */
 	uss820dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods uss820dci_device_isoc_fs_methods =
@@ -1794,7 +1755,6 @@ uss820dci_root_ctrl_close(struct usb2_xfer *xfer)
 		sc->sc_root_ctrl.xfer = NULL;
 	}
 	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 /*
@@ -1899,8 +1859,6 @@ uss820dci_root_ctrl_start(struct usb2_xfer *xfer)
 
 	usb2_config_td_queue_command(
 	    &sc->sc_config_td, NULL, &uss820dci_root_ctrl_task, 0, 0);
-
-	return;
 }
 
 static void
@@ -1908,7 +1866,6 @@ uss820dci_root_ctrl_task(struct uss820dci_softc *sc,
     struct uss820dci_config_copy *cc, uint16_t refcount)
 {
 	uss820dci_root_ctrl_poll(sc);
-	return;
 }
 
 static void
@@ -2308,7 +2265,6 @@ uss820dci_root_ctrl_poll(struct uss820dci_softc *sc)
 {
 	usb2_sw_transfer(&sc->sc_root_ctrl,
 	    &uss820dci_root_ctrl_done);
-	return;
 }
 
 struct usb2_pipe_methods uss820dci_root_ctrl_methods =
@@ -2339,7 +2295,6 @@ uss820dci_root_intr_close(struct usb2_xfer *xfer)
 		sc->sc_root_intr.xfer = NULL;
 	}
 	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2354,7 +2309,6 @@ uss820dci_root_intr_start(struct usb2_xfer *xfer)
 	struct uss820dci_softc *sc = xfer->usb2_sc;
 
 	sc->sc_root_intr.xfer = xfer;
-	return;
 }
 
 struct usb2_pipe_methods uss820dci_root_intr_methods =
@@ -2492,7 +2446,6 @@ uss820dci_xfer_setup(struct usb2_setup_params *parm)
 	}
 
 	xfer->td_start[0] = last_obj;
-	return;
 }
 
 static void
@@ -2557,7 +2510,6 @@ uss820dci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *e
 			break;
 		}
 	}
-	return;
 }
 
 struct usb2_bus_methods uss820dci_bus_methods =