From dc41cd35e3ab3f4a04926ed87b62fab7470f861c Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Thu, 11 Dec 2008 23:17:48 +0000 Subject: [PATCH] Remove superfluous return statements from the end of void functions. --- sys/dev/usb2/bluetooth/ng_ubt2.c | 9 -- sys/dev/usb2/bluetooth/ubtbcmfw2.c | 7 -- sys/dev/usb2/controller/at91dci.c | 48 ----------- sys/dev/usb2/controller/at91dci_atmelarm.c | 5 -- sys/dev/usb2/controller/ehci2.c | 56 ------------ sys/dev/usb2/controller/ehci2_pci.c | 1 - sys/dev/usb2/controller/musb2_otg.c | 47 ---------- sys/dev/usb2/controller/musb2_otg_atmelarm.c | 5 -- sys/dev/usb2/controller/ohci2.c | 44 ---------- sys/dev/usb2/controller/uhci2.c | 52 ----------- sys/dev/usb2/controller/usb2_controller.c | 11 --- sys/dev/usb2/controller/uss820dci.c | 48 ----------- sys/dev/usb2/core/usb2_busdma.c | 30 ------- sys/dev/usb2/core/usb2_compat_linux.c | 12 --- sys/dev/usb2/core/usb2_config_td.c | 4 - sys/dev/usb2/core/usb2_debug.c | 5 -- sys/dev/usb2/core/usb2_dev.c | 22 ----- sys/dev/usb2/core/usb2_device.c | 16 ---- sys/dev/usb2/core/usb2_dynamic.c | 8 -- sys/dev/usb2/core/usb2_generic.c | 13 --- sys/dev/usb2/core/usb2_handle_request.c | 1 - sys/dev/usb2/core/usb2_hub.c | 9 -- sys/dev/usb2/core/usb2_msctest.c | 8 -- sys/dev/usb2/core/usb2_process.c | 5 -- sys/dev/usb2/core/usb2_request.c | 2 - sys/dev/usb2/core/usb2_sw_transfer.c | 1 - sys/dev/usb2/core/usb2_transfer.c | 34 -------- sys/dev/usb2/core/usb2_util.c | 9 -- sys/dev/usb2/ethernet/if_aue2.c | 33 ------- sys/dev/usb2/ethernet/if_axe2.c | 32 ------- sys/dev/usb2/ethernet/if_cdce2.c | 16 ---- sys/dev/usb2/ethernet/if_cue2.c | 23 ----- sys/dev/usb2/ethernet/if_kue2.c | 24 ------ sys/dev/usb2/ethernet/if_rue2.c | 32 ------- sys/dev/usb2/ethernet/if_udav2.c | 35 -------- sys/dev/usb2/ethernet/usb2_ethernet.c | 1 - sys/dev/usb2/image/uscanner2.c | 5 -- sys/dev/usb2/input/uhid2.c | 8 -- sys/dev/usb2/input/ukbd2.c | 7 -- sys/dev/usb2/input/ums2.c | 9 -- sys/dev/usb2/misc/udbp2.c | 4 - sys/dev/usb2/quirk/usb2_quirk.c | 2 - sys/dev/usb2/serial/uark2.c | 10 --- sys/dev/usb2/serial/ubsa2.c | 13 --- sys/dev/usb2/serial/ubser2.c | 9 -- sys/dev/usb2/serial/uchcom2.c | 35 -------- sys/dev/usb2/serial/ucycom2.c | 8 -- sys/dev/usb2/serial/ufoma2.c | 18 ---- sys/dev/usb2/serial/uftdi2.c | 14 --- sys/dev/usb2/serial/ugensa2.c | 6 -- sys/dev/usb2/serial/uipaq2.c | 10 --- sys/dev/usb2/serial/ulpt2.c | 12 --- sys/dev/usb2/serial/umct2.c | 12 --- sys/dev/usb2/serial/umodem2.c | 15 ---- sys/dev/usb2/serial/umoscom2.c | 17 ---- sys/dev/usb2/serial/uplcom2.c | 13 --- sys/dev/usb2/serial/usb2_serial.c | 27 ------ sys/dev/usb2/serial/uvisor2.c | 7 -- sys/dev/usb2/serial/uvscom2.c | 17 ---- sys/dev/usb2/sound/uaudio2.c | 31 ------- sys/dev/usb2/storage/ata-usb2.c | 9 -- sys/dev/usb2/storage/umass2.c | 29 ------- sys/dev/usb2/storage/urio2.c | 7 -- sys/dev/usb2/storage/ustorage2_fs.c | 7 -- sys/dev/usb2/template/usb2_template.c | 8 -- sys/dev/usb2/wlan/if_rum2.c | 71 --------------- sys/dev/usb2/wlan/if_ural2.c | 67 --------------- sys/dev/usb2/wlan/if_zyd2.c | 90 -------------------- 68 files changed, 1305 deletions(-) diff --git a/sys/dev/usb2/bluetooth/ng_ubt2.c b/sys/dev/usb2/bluetooth/ng_ubt2.c index 84f716a63376..17513127115c 100644 --- a/sys/dev/usb2/bluetooth/ng_ubt2.c +++ b/sys/dev/usb2/bluetooth/ng_ubt2.c @@ -818,7 +818,6 @@ ubt_intr_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UBT_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -883,8 +882,6 @@ ubt_intr_read_complete(node_p node, hook_p hook, void *arg1, int arg2) usb2_transfer_start(sc->sc_xfer_if_0[2]); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -972,7 +969,6 @@ ubt_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UBT_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1040,8 +1036,6 @@ ubt_bulk_read_complete(node_p node, hook_p hook, void *arg1, int arg2) usb2_transfer_start(sc->sc_xfer_if_0[1]); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1121,7 +1115,6 @@ ubt_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UBT_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1265,8 +1258,6 @@ ubt_isoc_read_complete(node_p node, hook_p hook, void *arg1, int arg2) } mtx_unlock(&sc->sc_mtx); - - return; } static void diff --git a/sys/dev/usb2/bluetooth/ubtbcmfw2.c b/sys/dev/usb2/bluetooth/ubtbcmfw2.c index 440b5cda6566..c270aafde5a6 100644 --- a/sys/dev/usb2/bluetooth/ubtbcmfw2.c +++ b/sys/dev/usb2/bluetooth/ubtbcmfw2.c @@ -305,7 +305,6 @@ ubtbcmfw_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UBTBCMFW_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -351,7 +350,6 @@ ubtbcmfw_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UBTBCMFW_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -360,7 +358,6 @@ ubtbcmfw_start_read(struct usb2_fifo *fifo) struct ubtbcmfw_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -370,7 +367,6 @@ ubtbcmfw_stop_read(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -379,7 +375,6 @@ ubtbcmfw_start_write(struct usb2_fifo *fifo) struct ubtbcmfw_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -389,7 +384,6 @@ ubtbcmfw_stop_write(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static int @@ -424,7 +418,6 @@ ubtbcmfw_close(struct usb2_fifo *fifo, int fflags, struct thread *td) if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); } - return; } static int diff --git a/sys/dev/usb2/controller/at91dci.c b/sys/dev/usb2/controller/at91dci.c index 1363c0d45f95..2827fe62467a 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 @@ at91dci_interrupt_poll(struct at91dci_softc *sc) 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 dd01773b40ac..d0772fe0f7fa 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 f84f5ad66a97..c514200a0d59 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 @@ ehci_interrupt_poll(ehci_softc_t *sc) 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 @@ ehci_setup_standard_chain_sub(struct ehci_std_temp *temp) } 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 @@ ehci_xfer_setup(struct usb2_setup_params *parm) 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 2d33cb048b89..41b5c2caf2ad 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 2b3b94ad2bdd..fc839bb60e64 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 @@ musbotg_interrupt_poll(struct musbotg_softc *sc) 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 @@ musbotg_interrupt(struct musbotg_softc *sc) 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 49b653ffbb62..f67de1ed565b 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 8ed49d369772..5ea465c8be9e 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 @@ ohci_interrupt_poll(ohci_softc_t *sc) 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 @@ ohci_setup_standard_chain_sub(struct ohci_std_temp *temp) } 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 @@ ohci_xfer_setup(struct usb2_setup_params *parm) 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 ae03b8d276cb..ceb87e67470f 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 @@ uhci_reset(uhci_softc_t *sc) 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 @@ uhci_interrupt_poll(uhci_softc_t *sc) 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 @@ uhci_setup_standard_chain_sub(struct uhci_std_temp *temp) } 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 @@ uhci_xfer_setup(struct usb2_setup_params *parm) 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 a9952d29c405..7c3ea896e442 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 c72caaf46234..7148acc1506b 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 @@ uss820dci_interrupt_poll(struct uss820dci_softc *sc) 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 = diff --git a/sys/dev/usb2/core/usb2_busdma.c b/sys/dev/usb2/core/usb2_busdma.c index 12937e5099d7..33851f0f1431 100644 --- a/sys/dev/usb2/core/usb2_busdma.c +++ b/sys/dev/usb2/core/usb2_busdma.c @@ -111,7 +111,6 @@ usb2_get_page(struct usb2_page_cache *pc, uint32_t offset, res->length = 0 - 1; res->physaddr = 0; } - return; } /*------------------------------------------------------------------------* @@ -136,7 +135,6 @@ usb2_copy_in(struct usb2_page_cache *cache, uint32_t offset, len -= buf_res.length; ptr = USB_ADD_BYTES(ptr, buf_res.length); } - return; } /*------------------------------------------------------------------------* @@ -201,7 +199,6 @@ usb2_m_copy_in(struct usb2_page_cache *cache, uint32_t dst_offset, register int error; error = m_apply(m, src_offset, src_len, &usb2_m_copy_in_cb, &arg); - return; } /*------------------------------------------------------------------------* @@ -258,7 +255,6 @@ usb2_copy_out(struct usb2_page_cache *cache, uint32_t offset, len -= res.length; ptr = USB_ADD_BYTES(ptr, res.length); } - return; } /*------------------------------------------------------------------------* @@ -313,7 +309,6 @@ usb2_bzero(struct usb2_page_cache *cache, uint32_t offset, uint32_t len) offset += res.length; len -= res.length; } - return; } @@ -326,7 +321,6 @@ static void usb2_dma_lock_cb(void *arg, bus_dma_lock_op_t op) { /* we use "mtx_owned()" instead of this function */ - return; } /*------------------------------------------------------------------------* @@ -361,7 +355,6 @@ usb2_dma_tag_create(struct usb2_dma_tag *udt, tag = NULL; } udt->tag = tag; - return; } /*------------------------------------------------------------------------* @@ -371,7 +364,6 @@ static void usb2_dma_tag_destroy(struct usb2_dma_tag *udt) { bus_dma_tag_destroy(udt->tag); - return; } /*------------------------------------------------------------------------* @@ -382,7 +374,6 @@ usb2_pc_alloc_mem_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) { usb2_pc_common_mem_cb(arg, segs, nseg, error, 0); - return; } /*------------------------------------------------------------------------* @@ -393,7 +384,6 @@ usb2_pc_load_mem_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) { usb2_pc_common_mem_cb(arg, segs, nseg, error, 1); - return; } /*------------------------------------------------------------------------* @@ -449,7 +439,6 @@ usb2_pc_common_mem_cb(void *arg, bus_dma_segment_t *segs, } if (!owned) mtx_unlock(uptag->mtx); - return; } /*------------------------------------------------------------------------* @@ -574,7 +563,6 @@ usb2_pc_free_mem(struct usb2_page_cache *pc) pc->buffer = NULL; } - return; } /*------------------------------------------------------------------------* @@ -662,7 +650,6 @@ usb2_pc_cpu_invalidate(struct usb2_page_cache *pc) } bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); - return; } /*------------------------------------------------------------------------* @@ -677,7 +664,6 @@ usb2_pc_cpu_flush(struct usb2_page_cache *pc) } bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); - return; } /*------------------------------------------------------------------------* @@ -730,7 +716,6 @@ usb2_pc_dmamap_destroy(struct usb2_page_cache *pc) pc->tag = NULL; pc->map = NULL; } - return; } #endif @@ -763,7 +748,6 @@ usb2_dma_tag_create(struct usb2_dma_tag *udt, } udt->tag = udt->tag_parent->tag; udt->n_seg = nseg; - return; } /*------------------------------------------------------------------------* @@ -773,7 +757,6 @@ static void usb2_dma_tag_destroy(struct usb2_dma_tag *udt) { free(udt->p_seg, M_USB); - return; } /*------------------------------------------------------------------------* @@ -831,7 +814,6 @@ usb2_pc_common_mem_cb(struct usb2_page_cache *pc, bus_dma_segment_t *segs, } if (dolock) mtx_unlock(uptag->mtx); - return; } /*------------------------------------------------------------------------* @@ -956,7 +938,6 @@ usb2_pc_free_mem(struct usb2_page_cache *pc) free(pc->p_seg, M_USB); pc->buffer = NULL; } - return; } /*------------------------------------------------------------------------* @@ -1027,7 +1008,6 @@ usb2_pc_cpu_invalidate(struct usb2_page_cache *pc) } bus_dmamap_sync(pc->tag, pc->map, 0, len, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); - return; } /*------------------------------------------------------------------------* @@ -1046,7 +1026,6 @@ usb2_pc_cpu_flush(struct usb2_page_cache *pc) } bus_dmamap_sync(pc->tag, pc->map, 0, len, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); - return; } /*------------------------------------------------------------------------* @@ -1103,7 +1082,6 @@ usb2_pc_dmamap_destroy(struct usb2_page_cache *pc) pc->tag = NULL; pc->map = NULL; } - return; } #endif @@ -1181,7 +1159,6 @@ usb2_dma_tag_setup(struct usb2_dma_parent_tag *udpt, udt->tag_parent = udpt; udt++; } - return; } /*------------------------------------------------------------------------* @@ -1212,7 +1189,6 @@ usb2_dma_tag_unsetup(struct usb2_dma_parent_tag *udpt) usb2_cv_destroy(udpt->cv); #endif } - return; } /*------------------------------------------------------------------------* @@ -1340,8 +1316,6 @@ usb2_bdma_work_loop(struct usb2_xfer_queue *pq) /* finally start the hardware */ usb2_pipe_enter(xfer); - - return; } /*------------------------------------------------------------------------* @@ -1365,7 +1339,6 @@ usb2_bdma_done_event(struct usb2_dma_parent_tag *udpt) /* enter workloop again */ usb2_command_wrapper(&info->dma_q, info->dma_q.curr); - return; } /*------------------------------------------------------------------------* @@ -1399,8 +1372,6 @@ usb2_bdma_pre_sync(struct usb2_xfer *xfer) } pc++; } - - return; } /*------------------------------------------------------------------------* @@ -1431,5 +1402,4 @@ usb2_bdma_post_sync(struct usb2_xfer *xfer) } pc++; } - return; } diff --git a/sys/dev/usb2/core/usb2_compat_linux.c b/sys/dev/usb2/core/usb2_compat_linux.c index 9f73c94073db..b094a4290629 100644 --- a/sys/dev/usb2/core/usb2_compat_linux.c +++ b/sys/dev/usb2/core/usb2_compat_linux.c @@ -470,7 +470,6 @@ usb_unlink_bsd(struct usb2_xfer *xfer, } usb2_transfer_start(xfer); } - return; } static int @@ -1134,7 +1133,6 @@ usb_linux_register(void *arg) mtx_unlock(&Giant); usb2_needs_explore_all(); - return; } /*------------------------------------------------------------------------* @@ -1164,7 +1162,6 @@ usb_linux_deregister(void *arg) } LIST_REMOVE(drv, linux_driver_list); mtx_unlock(&Giant); - return; } /*------------------------------------------------------------------------* @@ -1188,7 +1185,6 @@ usb_linux_free_device(struct usb_device *dev) } err = usb_setup_endpoint(dev, &dev->ep0, 0); free(dev, M_USBDEV); - return; } /*------------------------------------------------------------------------* @@ -1199,7 +1195,6 @@ usb_buffer_free(struct usb_device *dev, uint32_t size, void *addr, uint8_t dma_addr) { free(addr, M_USBDEV); - return; } /*------------------------------------------------------------------------* @@ -1219,7 +1214,6 @@ usb_free_urb(struct urb *urb) /* just free it */ free(urb, M_USBDEV); - return; } /*------------------------------------------------------------------------* @@ -1236,7 +1230,6 @@ usb_init_urb(struct urb *urb) return; } bzero(urb, sizeof(*urb)); - return; } /*------------------------------------------------------------------------* @@ -1248,7 +1241,6 @@ usb_kill_urb(struct urb *urb) if (usb_unlink_urb_sub(urb, 1)) { /* ignore */ } - return; } /*------------------------------------------------------------------------* @@ -1261,7 +1253,6 @@ void usb_set_intfdata(struct usb_interface *intf, void *data) { intf->bsd_priv_sc = data; - return; } /*------------------------------------------------------------------------* @@ -1290,7 +1281,6 @@ usb_linux_cleanup_interface(struct usb_device *dev, struct usb_interface *iface) } uhi++; } - return; } /*------------------------------------------------------------------------* @@ -1306,7 +1296,6 @@ usb_linux_wait_complete(struct urb *urb) usb2_cv_signal(&urb->cv_wait); } urb->transfer_flags &= ~URB_WAIT_WAKEUP; - return; } /*------------------------------------------------------------------------* @@ -1322,7 +1311,6 @@ usb_linux_complete(struct usb2_xfer *xfer) if (urb->complete) { (urb->complete) (urb); } - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/core/usb2_config_td.c b/sys/dev/usb2/core/usb2_config_td.c index ac652fd256db..4d05559dad36 100644 --- a/sys/dev/usb2/core/usb2_config_td.c +++ b/sys/dev/usb2/core/usb2_config_td.c @@ -51,7 +51,6 @@ usb2_config_td_dispatch(struct usb2_proc_msg *pm) (ctd->p_end_of_commands) (ctd->p_softc); } } - return; } /*------------------------------------------------------------------------* @@ -120,7 +119,6 @@ usb2_config_td_drain(struct usb2_config_td *ctd) if (ctd->p_msgs) { usb2_proc_drain(&ctd->usb2_proc); } - return; } /*------------------------------------------------------------------------* @@ -141,7 +139,6 @@ usb2_config_td_unsetup(struct usb2_config_td *ctd) free(ctd->p_msgs, M_USBDEV); ctd->p_msgs = NULL; } - return; } /*------------------------------------------------------------------------* @@ -234,7 +231,6 @@ usb2_config_td_queue_command(struct usb2_config_td *ctd, if (command_sync == USB2_CONFIG_TD_SYNC) { usb2_proc_mwait(&ctd->usb2_proc, pi_0, pi_1); } - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/core/usb2_debug.c b/sys/dev/usb2/core/usb2_debug.c index 7969662387c7..dc9067d1332c 100644 --- a/sys/dev/usb2/core/usb2_debug.c +++ b/sys/dev/usb2/core/usb2_debug.c @@ -56,7 +56,6 @@ usb2_dump_iface(struct usb2_interface *iface) } printf(" iface=%p idesc=%p altindex=%d\n", iface, iface->idesc, iface->alt_index); - return; } /*------------------------------------------------------------------------* @@ -77,7 +76,6 @@ usb2_dump_device(struct usb2_device *udev) udev->bus, udev->address, udev->curr_config_no, udev->depth, udev->speed, udev->flags.self_powered, udev->power, udev->langid); - return; } /*------------------------------------------------------------------------* @@ -95,7 +93,6 @@ usb2_dump_queue(struct usb2_pipe *pipe) printf(" %p", xfer); } printf("\n"); - return; } /*------------------------------------------------------------------------* @@ -121,7 +118,6 @@ usb2_dump_pipe(struct usb2_pipe *pipe) } else { printf("usb2_dump_pipe: pipe=NULL\n"); } - return; } /*------------------------------------------------------------------------* @@ -149,5 +145,4 @@ usb2_dump_xfer(struct usb2_xfer *xfer) xfer->udev->address, xfer->pipe, xfer->pipe->edesc->bEndpointAddress, xfer->pipe->edesc->bmAttributes); - return; } diff --git a/sys/dev/usb2/core/usb2_dev.c b/sys/dev/usb2/core/usb2_dev.c index 0ac7418e4884..ee8341111b91 100644 --- a/sys/dev/usb2/core/usb2_dev.c +++ b/sys/dev/usb2/core/usb2_dev.c @@ -244,7 +244,6 @@ usb2_set_iface_perm(struct usb2_device *udev, uint8_t iface_index, mtx_unlock(&usb2_ref_lock); } - return; } /*------------------------------------------------------------------------* @@ -709,7 +708,6 @@ usb2_unref_device(struct usb2_location *ploc) } } mtx_unlock(&usb2_ref_lock); - return; } static struct usb2_fifo * @@ -936,7 +934,6 @@ usb2_fifo_free(struct usb2_fifo *f) usb2_cv_destroy(&f->cv_drain); free(f, M_USBDEV); - return; } static struct usb2_pipe * @@ -1076,7 +1073,6 @@ usb2_fifo_reset(struct usb2_fifo *f) break; } } - return; } /*------------------------------------------------------------------------* @@ -1156,7 +1152,6 @@ usb2_fifo_close(struct usb2_fifo *f, struct thread *td, int fflags) (f->methods->f_close) (f, fflags, td); DPRINTF("closed\n"); - return; } /*------------------------------------------------------------------------* @@ -1448,7 +1443,6 @@ usb2_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev) } dev_ref(usb2_dev); *dev = usb2_dev; - return; } static void @@ -1460,7 +1454,6 @@ usb2_dev_init(void *arg) /* check the UGEN methods */ usb2_fifo_check_methods(&usb2_ugen_methods); - return; } SYSINIT(usb2_dev_init, SI_SUB_KLD, SI_ORDER_FIRST, usb2_dev_init, NULL); @@ -1487,7 +1480,6 @@ usb2_dev_init_post(void *arg) if (usb2_clone_tag == NULL) { DPRINTFN(0, "Registering clone handler failed!\n"); } - return; } SYSINIT(usb2_dev_init_post, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, usb2_dev_init_post, NULL); @@ -1505,7 +1497,6 @@ usb2_dev_uninit(void *arg) } mtx_destroy(&usb2_ref_lock); sx_destroy(&usb2_sym_lock); - return; } SYSUNINIT(usb2_dev_uninit, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, usb2_dev_uninit, NULL); @@ -2062,7 +2053,6 @@ usb2_fifo_signal(struct usb2_fifo *f) f->flag_sleeping = 0; usb2_cv_broadcast(&f->cv_io); } - return; } void @@ -2079,7 +2069,6 @@ usb2_fifo_wakeup(struct usb2_fifo *f) psignal(f->async_p, SIGIO); PROC_UNLOCK(f->async_p); } - return; } /*------------------------------------------------------------------------* @@ -2137,7 +2126,6 @@ static void usb2_fifo_dummy_cmd(struct usb2_fifo *fifo) { fifo->flag_flushing = 0; /* not flushing */ - return; } static void @@ -2168,8 +2156,6 @@ usb2_fifo_check_methods(struct usb2_fifo_methods *pm) if (pm->f_stop_write == NULL) pm->f_stop_write = &usb2_fifo_dummy_cmd; - - return; } /*------------------------------------------------------------------------* @@ -2347,7 +2333,6 @@ usb2_fifo_free_buffer(struct usb2_fifo *f) bzero(&f->free_q, sizeof(f->free_q)); bzero(&f->used_q, sizeof(f->used_q)); - return; } void @@ -2363,8 +2348,6 @@ usb2_fifo_detach(struct usb2_fifo_sc *f_sc) f_sc->fp[USB_FIFO_RX] = NULL; DPRINTFN(2, "detached %p\n", f_sc); - - return; } uint32_t @@ -2426,7 +2409,6 @@ usb2_fifo_put_data(struct usb2_fifo *f, struct usb2_page_cache *pc, break; } } - return; } void @@ -2465,7 +2447,6 @@ usb2_fifo_put_data_linear(struct usb2_fifo *f, void *ptr, break; } } - return; } uint8_t @@ -2490,7 +2471,6 @@ usb2_fifo_put_data_error(struct usb2_fifo *f) { f->flag_iserror = 1; usb2_fifo_wakeup(f); - return; } /*------------------------------------------------------------------------* @@ -2642,7 +2622,6 @@ usb2_fifo_get_data_error(struct usb2_fifo *f) { f->flag_iserror = 1; usb2_fifo_wakeup(f); - return; } /*------------------------------------------------------------------------* @@ -2691,7 +2670,6 @@ usb2_free_symlink(struct usb2_symlink *ps) sx_unlock(&usb2_sym_lock); free(ps, M_USBDEV); - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/core/usb2_device.c b/sys/dev/usb2/core/usb2_device.c index 9c2702c0ec7e..2356cc58b37d 100644 --- a/sys/dev/usb2/core/usb2_device.c +++ b/sys/dev/usb2/core/usb2_device.c @@ -306,7 +306,6 @@ usb2_fill_pipe_data(struct usb2_device *udev, uint8_t iface_index, (udev->bus->methods->clear_stall) (udev, pipe); USB_BUS_UNLOCK(udev->bus); } - return; } /*------------------------------------------------------------------------* @@ -333,7 +332,6 @@ usb2_free_pipe_data(struct usb2_device *udev, } pipe++; } - return; } /*------------------------------------------------------------------------* @@ -480,7 +478,6 @@ usb2_free_iface_data(struct usb2_device *udev) /* set unconfigured state */ udev->curr_config_no = USB_UNCONFIG_NO; udev->curr_config_index = USB_UNCONFIG_INDEX; - return; } /*------------------------------------------------------------------------* @@ -863,7 +860,6 @@ usb2_detach_device_sub(struct usb2_device *udev, device_t *ppdev, error: /* Detach is not allowed to fail in the USB world */ panic("An USB driver would not detach!\n"); - return; } /*------------------------------------------------------------------------* @@ -923,7 +919,6 @@ usb2_detach_device(struct usb2_device *udev, uint8_t iface_index, if (do_unlock) { sx_unlock(udev->default_sx + 1); } - return; } /*------------------------------------------------------------------------* @@ -1027,7 +1022,6 @@ usb2_set_parent_iface(struct usb2_device *udev, uint8_t iface_index, if (iface) { iface->parent_iface_index = parent_index; } - return; } static void @@ -1048,8 +1042,6 @@ usb2_init_attach_arg(struct usb2_device *udev, uaa->info.bDeviceProtocol = udev->ddesc.bDeviceProtocol; uaa->info.bConfigIndex = udev->curr_config_index; uaa->info.bConfigNum = udev->curr_config_no; - - return; } /*------------------------------------------------------------------------* @@ -1191,7 +1183,6 @@ usb2_suspend_resume_sub(struct usb2_device *udev, device_t dev, uint8_t do_suspe device_printf(dev, "%s failed!\n", do_suspend ? "Suspend" : "Resume"); } - return; } /*------------------------------------------------------------------------* @@ -1262,7 +1253,6 @@ usb2_clear_stall_proc(struct usb2_proc_msg *_pm) /* Change lock */ mtx_unlock(udev->default_mtx); USB_BUS_LOCK(udev->bus); - return; } /*------------------------------------------------------------------------* @@ -1731,8 +1721,6 @@ usb2_free_device(struct usb2_device *udev) /* free device */ free(udev, M_USB); - - return; } /*------------------------------------------------------------------------* @@ -1844,7 +1832,6 @@ usb2_devinfo(struct usb2_device *udev, char *dst_ptr, uint16_t dst_len) (bcdDevice >> 8), bcdDevice & 0xFF, udev->address); } - return; } #if USB_VERBOSE @@ -1942,7 +1929,6 @@ usb2_check_strings(struct usb2_device *udev) snprintf(udev->product, sizeof(udev->product), "product 0x%04x", product_id); } - return; } uint8_t @@ -2079,7 +2065,6 @@ usb2_notify_addq(const char *type, struct usb2_device *udev) device_get_nameunit(device_get_parent(udev->bus->bdev))); } devctl_queue_data(data); - return; } /*------------------------------------------------------------------------* @@ -2137,5 +2122,4 @@ usb2_fifo_free_wrap(struct usb2_device *udev, /* free this FIFO */ usb2_fifo_free(f); } - return; } diff --git a/sys/dev/usb2/core/usb2_dynamic.c b/sys/dev/usb2/core/usb2_dynamic.c index 2bd4b01331ce..bf7ce591937d 100644 --- a/sys/dev/usb2/core/usb2_dynamic.c +++ b/sys/dev/usb2/core/usb2_dynamic.c @@ -73,7 +73,6 @@ usb2_temp_get_desc_w(struct usb2_device *udev, struct usb2_device_request *req, /* stall */ *pPtr = NULL; *pLength = 0; - return; } static void @@ -85,7 +84,6 @@ usb2_temp_unsetup_w(struct usb2_device *udev) udev->usb2_template_ptr = NULL; } - return; } void @@ -101,8 +99,6 @@ usb2_quirk_unload(void *arg) /* XXX this is a tradeoff */ pause("WAIT", hz); - - return; } void @@ -119,8 +115,6 @@ usb2_temp_unload(void *arg) /* XXX this is a tradeoff */ pause("WAIT", hz); - - return; } void @@ -135,6 +129,4 @@ usb2_bus_unload(void *arg) /* XXX this is a tradeoff */ pause("WAIT", hz); - - return; } diff --git a/sys/dev/usb2/core/usb2_generic.c b/sys/dev/usb2/core/usb2_generic.c index 2261e6a43a59..fa09eef675b2 100644 --- a/sys/dev/usb2/core/usb2_generic.c +++ b/sys/dev/usb2/core/usb2_generic.c @@ -196,7 +196,6 @@ ugen_close(struct usb2_fifo *f, int fflags, struct thread *td) /* ignore any errors - we are closing */ DPRINTFN(6, "no FIFOs\n"); } - return; } static int @@ -348,7 +347,6 @@ ugen_start_read(struct usb2_fifo *f) /* start transfers */ usb2_transfer_start(f->xfer[0]); usb2_transfer_start(f->xfer[1]); - return; } static void @@ -362,7 +360,6 @@ ugen_start_write(struct usb2_fifo *f) /* start transfers */ usb2_transfer_start(f->xfer[0]); usb2_transfer_start(f->xfer[1]); - return; } static void @@ -371,7 +368,6 @@ ugen_stop_io(struct usb2_fifo *f) /* stop transfers */ usb2_transfer_stop(f->xfer[0]); usb2_transfer_stop(f->xfer[1]); - return; } static void @@ -422,7 +418,6 @@ ugen_default_read_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -461,7 +456,6 @@ ugen_default_write_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -479,7 +473,6 @@ ugen_read_clear_stall_callback(struct usb2_xfer *xfer) f->flag_stall = 0; usb2_transfer_start(xfer_other); } - return; } static void @@ -497,7 +490,6 @@ ugen_write_clear_stall_callback(struct usb2_xfer *xfer) f->flag_stall = 0; usb2_transfer_start(xfer_other); } - return; } static void @@ -537,7 +529,6 @@ ugen_isoc_read_callback(struct usb2_xfer *xfer) } goto tr_setup; } - return; } static void @@ -578,7 +569,6 @@ ugen_isoc_write_callback(struct usb2_xfer *xfer) } goto tr_setup; } - return; } static int @@ -1024,8 +1014,6 @@ ugen_fs_set_complete(struct usb2_fifo *f, uint8_t index) f->flag_iscomplete = 1; usb2_fifo_wakeup(f); - - return; } static int @@ -2189,5 +2177,4 @@ ugen_default_fs_callback(struct usb2_xfer *xfer) ugen_fs_set_complete(xfer->priv_sc, USB_P2U(xfer->priv_fifo)); break; } - return; } diff --git a/sys/dev/usb2/core/usb2_handle_request.c b/sys/dev/usb2/core/usb2_handle_request.c index 30f489659391..d5714b45fabf 100644 --- a/sys/dev/usb2/core/usb2_handle_request.c +++ b/sys/dev/usb2/core/usb2_handle_request.c @@ -114,7 +114,6 @@ usb2_handle_request_callback(struct usb2_xfer *xfer) xfer->flags.force_short_xfer = 0; xfer->flags.stall_pipe = 1; /* cancel previous transfer, if any */ usb2_start_hardware(xfer); - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/core/usb2_hub.c b/sys/dev/usb2/core/usb2_hub.c index b5336a9a3476..34b275a40aa3 100644 --- a/sys/dev/usb2/core/usb2_hub.c +++ b/sys/dev/usb2/core/usb2_hub.c @@ -159,7 +159,6 @@ uhub_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UHUB_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -832,7 +831,6 @@ static void uhub_driver_added(device_t dev, driver_t *driver) { usb2_needs_explore_all(); - return; } struct hub_result { @@ -872,7 +870,6 @@ uhub_find_iface_index(struct usb2_hub *hub, device_t child, res->iface_index = 0; res->udev = NULL; res->portno = 0; - return; } static int @@ -1060,7 +1057,6 @@ usb2_fs_isoc_schedule_init_sub(struct usb2_fs_isoc_schedule *fss) USB_FS_BYTES_PER_HS_UFRAME); fss->frame_bytes = (USB_FS_BYTES_PER_HS_UFRAME); fss->frame_slot = 0; - return; } /*------------------------------------------------------------------------* @@ -1078,7 +1074,6 @@ usb2_fs_isoc_schedule_init_all(struct usb2_fs_isoc_schedule *fss) usb2_fs_isoc_schedule_init_sub(fss); fss++; } - return; } /*------------------------------------------------------------------------* @@ -1276,8 +1271,6 @@ usb2_bus_port_set_device(struct usb2_bus *bus, struct usb2_port *up, * Debug print */ DPRINTFN(2, "bus %p devices[%u] = %p\n", bus, device_index, udev); - - return; } /*------------------------------------------------------------------------* @@ -1303,7 +1296,6 @@ usb2_needs_explore(struct usb2_bus *bus, uint8_t do_probe) /* ignore */ } USB_BUS_UNLOCK(bus); - return; } /*------------------------------------------------------------------------* @@ -1341,5 +1333,4 @@ usb2_needs_explore_all(void) } max--; } - return; } diff --git a/sys/dev/usb2/core/usb2_msctest.c b/sys/dev/usb2/core/usb2_msctest.c index bfafc14ccd40..ef616ce4f1b1 100644 --- a/sys/dev/usb2/core/usb2_msctest.c +++ b/sys/dev/usb2/core/usb2_msctest.c @@ -220,7 +220,6 @@ bbb_done(struct bbb_transfer *sc, uint8_t error) sc->state = ST_COMMAND; sc->status_try = 1; usb2_cv_signal(&sc->cv); - return; } static void @@ -228,7 +227,6 @@ bbb_transfer_start(struct bbb_transfer *sc, uint8_t xfer_index) { sc->state = xfer_index; usb2_transfer_start(sc->xfer[xfer_index]); - return; } static void @@ -248,7 +246,6 @@ bbb_data_clear_stall_callback(struct usb2_xfer *xfer, break; } } - return; } static void @@ -288,7 +285,6 @@ bbb_command_callback(struct usb2_xfer *xfer) bbb_done(sc, 1); break; } - return; } static void @@ -333,7 +329,6 @@ bbb_data_read_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -341,7 +336,6 @@ bbb_data_rd_cs_callback(struct usb2_xfer *xfer) { bbb_data_clear_stall_callback(xfer, ST_STATUS, ST_DATA_RD); - return; } static void @@ -394,7 +388,6 @@ bbb_data_wr_cs_callback(struct usb2_xfer *xfer) { bbb_data_clear_stall_callback(xfer, ST_STATUS, ST_DATA_WR); - return; } static void @@ -436,7 +429,6 @@ bbb_status_callback(struct usb2_xfer *xfer) } break; } - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/core/usb2_process.c b/sys/dev/usb2/core/usb2_process.c index 97365722e269..468bb30a1efb 100644 --- a/sys/dev/usb2/core/usb2_process.c +++ b/sys/dev/usb2/core/usb2_process.c @@ -161,7 +161,6 @@ usb2_process(void *arg) mtx_unlock(up->up_mtx); USB_THREAD_EXIT(0); - return; } /*------------------------------------------------------------------------* @@ -224,7 +223,6 @@ usb2_proc_unsetup(struct usb2_process *up) /* make sure that we do not enter here again */ up->up_mtx = NULL; - return; } /*------------------------------------------------------------------------* @@ -359,7 +357,6 @@ usb2_proc_mwait(struct usb2_process *up, void *_pm0, void *_pm1) up->up_dsleep = 1; usb2_cv_wait(&up->up_drain, up->up_mtx); } - return; } /*------------------------------------------------------------------------* @@ -414,7 +411,6 @@ usb2_proc_drain(struct usb2_process *up) "for USB process drain!\n"); } mtx_unlock(up->up_mtx); - return; } /*------------------------------------------------------------------------* @@ -476,5 +472,4 @@ usb2_proc_csignal(struct usb2_process *up) up->up_csleep = 0; usb2_cv_signal(&up->up_cv); } - return; } diff --git a/sys/dev/usb2/core/usb2_request.c b/sys/dev/usb2/core/usb2_request.c index b32d6899a52f..030a022c615a 100644 --- a/sys/dev/usb2/core/usb2_request.c +++ b/sys/dev/usb2/core/usb2_request.c @@ -83,7 +83,6 @@ usb2_do_request_callback(struct usb2_xfer *xfer) usb2_cv_signal(xfer->udev->default_cv); break; } - return; } /*------------------------------------------------------------------------* @@ -168,7 +167,6 @@ usb2_do_clear_stall_callback(struct usb2_xfer *xfer) /* store current pipe */ xfer->udev->pipe_curr = pipe; USB_BUS_UNLOCK(xfer->udev->bus); - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/core/usb2_sw_transfer.c b/sys/dev/usb2/core/usb2_sw_transfer.c index 2a2e1e424674..e88ffc8ee2b6 100644 --- a/sys/dev/usb2/core/usb2_sw_transfer.c +++ b/sys/dev/usb2/core/usb2_sw_transfer.c @@ -167,5 +167,4 @@ usb2_sw_transfer(struct usb2_sw_transfer *std, DPRINTF("done err=%s\n", usb2_errstr(std->err)); std->state = USB_SW_TR_PRE_CALLBACK; (func) (xfer, std); - return; } diff --git a/sys/dev/usb2/core/usb2_transfer.c b/sys/dev/usb2/core/usb2_transfer.c index ad84dd55733c..ede15299a666 100644 --- a/sys/dev/usb2/core/usb2_transfer.c +++ b/sys/dev/usb2/core/usb2_transfer.c @@ -149,7 +149,6 @@ usb2_update_max_frame_size(struct usb2_xfer *xfer) } else { xfer->max_frame_size = xfer->max_packet_size; } - return; } /*------------------------------------------------------------------------* @@ -698,7 +697,6 @@ usb2_transfer_setup_sub(struct usb2_setup_params *parm) xfer->nframes = 0; xfer->max_frame_count = 0; } - return; } /*------------------------------------------------------------------------* @@ -1078,7 +1076,6 @@ usb2_transfer_unsetup_sub(struct usb2_xfer_root *info, uint8_t needs_delay) * contained within the "memory_base"! */ free(info->memory_base, M_USB); - return; } /*------------------------------------------------------------------------* @@ -1169,7 +1166,6 @@ usb2_transfer_unsetup(struct usb2_xfer **pxfer, uint16_t n_setup) } } } - return; } /*------------------------------------------------------------------------* @@ -1201,8 +1197,6 @@ usb2_control_transfer_init(struct usb2_xfer *xfer) xfer->endpoint &= ~(UE_DIR_IN | UE_DIR_OUT); xfer->endpoint |= (req.bmRequestType & UT_READ) ? UE_DIR_IN : UE_DIR_OUT; - - return; } /*------------------------------------------------------------------------* @@ -1500,7 +1494,6 @@ usb2_start_hardware(struct usb2_xfer *xfer) * Device Controller schedule: */ usb2_pipe_enter(xfer); - return; } /*------------------------------------------------------------------------* @@ -1539,7 +1532,6 @@ usb2_pipe_enter(struct usb2_xfer *xfer) /* start the transfer */ usb2_command_wrapper(&pipe->pipe_q, xfer); USB_BUS_UNLOCK(xfer->udev->bus); - return; } /*------------------------------------------------------------------------* @@ -1572,7 +1564,6 @@ usb2_transfer_start(struct usb2_xfer *xfer) /* call the USB transfer callback */ usb2_callback_ss_done_defer(xfer); USB_BUS_UNLOCK(xfer->udev->bus); - return; } /*------------------------------------------------------------------------* @@ -1656,7 +1647,6 @@ usb2_transfer_stop(struct usb2_xfer *xfer) } USB_BUS_UNLOCK(xfer->udev->bus); - return; } /*------------------------------------------------------------------------* @@ -1733,8 +1723,6 @@ usb2_transfer_drain(struct usb2_xfer *xfer) usb2_cv_wait(&xfer->usb2_root->cv_drain, xfer->xfer_mtx); } USB_XFER_UNLOCK(xfer); - - return; } /*------------------------------------------------------------------------* @@ -1750,7 +1738,6 @@ usb2_set_frame_data(struct usb2_xfer *xfer, void *ptr, uint32_t frindex) { /* set virtual address to load and length */ xfer->frbuffers[frindex].buffer = ptr; - return; } /*------------------------------------------------------------------------* @@ -1769,7 +1756,6 @@ usb2_set_frame_offset(struct usb2_xfer *xfer, uint32_t offset, /* set virtual address to load */ xfer->frbuffers[frindex].buffer = USB_ADD_BYTES(xfer->local_buffer, offset); - return; } /*------------------------------------------------------------------------* @@ -1798,7 +1784,6 @@ usb2_callback_proc(struct usb2_proc_msg *_pm) info->done_q.curr); mtx_unlock(info->priv_mtx); - return; } /*------------------------------------------------------------------------* @@ -1944,7 +1929,6 @@ usb2_callback_wrapper(struct usb2_xfer_queue *pq) /* do the next callback, if any */ usb2_command_wrapper(&info->done_q, info->done_q.curr); - return; } /*------------------------------------------------------------------------* @@ -1968,7 +1952,6 @@ usb2_dma_delay_done_cb(void *arg) usb2_transfer_done(xfer, 0); USB_BUS_UNLOCK(xfer->udev->bus); - return; } /*------------------------------------------------------------------------* @@ -1989,7 +1972,6 @@ usb2_transfer_dequeue(struct usb2_xfer *xfer) TAILQ_REMOVE(&pq->head, xfer, wait_entry); xfer->wait_queue = NULL; } - return; } /*------------------------------------------------------------------------* @@ -2011,7 +1993,6 @@ usb2_transfer_enqueue(struct usb2_xfer_queue *pq, struct usb2_xfer *xfer) xfer->wait_queue = pq; TAILQ_INSERT_TAIL(&pq->head, xfer, wait_entry); } - return; } /*------------------------------------------------------------------------* @@ -2079,7 +2060,6 @@ usb2_transfer_done(struct usb2_xfer *xfer, usb2_error_t error) /* call the USB transfer callback */ usb2_callback_ss_done_defer(xfer); - return; } /*------------------------------------------------------------------------* @@ -2113,8 +2093,6 @@ usb2_transfer_start_cb(void *arg) xfer->flags_int.can_cancel_immed = 0; } USB_BUS_UNLOCK(xfer->udev->bus); - - return; } /*------------------------------------------------------------------------* @@ -2138,8 +2116,6 @@ usb2_transfer_set_stall(struct usb2_xfer *xfer) xfer->flags.stall_pipe = 1; USB_BUS_UNLOCK(xfer->udev->bus); - - return; } /*------------------------------------------------------------------------* @@ -2163,8 +2139,6 @@ usb2_transfer_clear_stall(struct usb2_xfer *xfer) xfer->flags.stall_pipe = 0; USB_BUS_UNLOCK(xfer->udev->bus); - - return; } /*------------------------------------------------------------------------* @@ -2271,7 +2245,6 @@ usb2_pipe_start(struct usb2_xfer_queue *pq) } else { xfer->flags_int.can_cancel_immed = 0; } - return; } /*------------------------------------------------------------------------* @@ -2290,7 +2263,6 @@ usb2_transfer_timeout_ms(struct usb2_xfer *xfer, /* defer delay */ usb2_callout_reset(&xfer->timeout_handle, USB_MS_TO_TICKS(ms), cb, xfer); - return; } /*------------------------------------------------------------------------* @@ -2519,7 +2491,6 @@ usb2_command_wrapper(struct usb2_xfer_queue *pq, struct usb2_xfer *xfer) /* clear second recurse flag */ pq->recurse_2 = 0; } - return; } /*------------------------------------------------------------------------* @@ -2590,7 +2561,6 @@ usb2_default_transfer_setup(struct usb2_device *udev) } else { goto repeat; } - return; } /*------------------------------------------------------------------------* @@ -2607,7 +2577,6 @@ usb2_clear_data_toggle(struct usb2_device *udev, struct usb2_pipe *pipe) USB_BUS_LOCK(udev->bus); pipe->toggle_next = 0; USB_BUS_UNLOCK(udev->bus); - return; } /*------------------------------------------------------------------------* @@ -2746,7 +2715,6 @@ usb2_callout_poll(struct usb2_xfer *xfer) } else { mtx_unlock(mtx); } - return; } @@ -2813,7 +2781,6 @@ usb2_do_poll(struct usb2_xfer **ppxfer, uint16_t max) USB_BUS_UNLOCK(xfer->udev->bus); } } - return; } #else @@ -2822,7 +2789,6 @@ void usb2_do_poll(struct usb2_xfer **ppxfer, uint16_t max) { /* polling not supported */ - return; } #endif diff --git a/sys/dev/usb2/core/usb2_util.c b/sys/dev/usb2/core/usb2_util.c index 7edb9a56f820..953997e5c9de 100644 --- a/sys/dev/usb2/core/usb2_util.c +++ b/sys/dev/usb2/core/usb2_util.c @@ -119,7 +119,6 @@ device_set_usb2_desc(device_t dev) device_set_desc_copy(dev, temp_p); device_printf(dev, "<%s> on %s\n", temp_p, device_get_nameunit(udev->bus->bdev)); - return; } /*------------------------------------------------------------------------* @@ -155,7 +154,6 @@ usb2_pause_mtx(struct mtx *mtx, uint32_t ms) if (mtx != NULL) mtx_lock(mtx); } - return; } /*------------------------------------------------------------------------* @@ -171,7 +169,6 @@ usb2_printBCD(char *p, uint16_t p_len, uint16_t bcd) if (snprintf(p, p_len, "%x.%02x", bcd >> 8, bcd & 0xff)) { /* ignore any errors */ } - return; } /*------------------------------------------------------------------------* @@ -195,7 +192,6 @@ usb2_trim_spaces(char *p) if (*p++ != ' ') /* remember last non-space */ e = p; *e = 0; /* kill trailing spaces */ - return; } /*------------------------------------------------------------------------* @@ -259,7 +255,6 @@ void usb2_cv_init(struct cv *cv, const char *desc) { cv_init(cv, desc); - return; } /*------------------------------------------------------------------------* @@ -269,7 +264,6 @@ void usb2_cv_destroy(struct cv *cv) { cv_destroy(cv); - return; } /*------------------------------------------------------------------------* @@ -281,7 +275,6 @@ usb2_cv_wait(struct cv *cv, struct mtx *mtx) int err; err = usb2_msleep(cv, mtx, 0, cv_wmesg(cv), 0); - return; } /*------------------------------------------------------------------------* @@ -317,7 +310,6 @@ void usb2_cv_signal(struct cv *cv) { wakeup_one(cv); - return; } /*------------------------------------------------------------------------* @@ -327,7 +319,6 @@ void usb2_cv_broadcast(struct cv *cv) { wakeup(cv); - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/ethernet/if_aue2.c b/sys/dev/usb2/ethernet/if_aue2.c index fc4488e747b3..90fb84968f4c 100644 --- a/sys/dev/usb2/ethernet/if_aue2.c +++ b/sys/dev/usb2/ethernet/if_aue2.c @@ -344,7 +344,6 @@ aue_cfg_do_request(struct aue_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } #define AUE_CFG_SETBIT(sc, reg, x) \ @@ -398,7 +397,6 @@ aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val) USETW(req.wLength, 1); aue_cfg_do_request(sc, &req, &val); - return; } static void @@ -415,7 +413,6 @@ aue_cfg_csr_write_2(struct aue_softc *sc, uint16_t reg, uint16_t val) val = htole16(val); aue_cfg_do_request(sc, &req, &val); - return; } /* @@ -450,8 +447,6 @@ aue_cfg_eeprom_getword(struct aue_softc *sc, uint8_t addr, dest[0] = (i & 0xFF); dest[1] = (i >> 8); - - return; } /* @@ -466,7 +461,6 @@ aue_cfg_read_eeprom(struct aue_softc *sc, uint8_t *dest, for (i = 0; i < len; i++) { aue_cfg_eeprom_getword(sc, off + i, dest + (i * 2)); } - return; } static int @@ -623,7 +617,6 @@ aue_cfg_miibus_statchg(device_t dev) if (do_unlock) { mtx_unlock(&sc->sc_mtx); } - return; } static void @@ -648,7 +641,6 @@ aue_cfg_setmulti(struct aue_softc *sc, for (i = 0; i < 8; i++) { aue_cfg_csr_write_1(sc, AUE_MAR0 + i, cc->if_hash[i]); } - return; } static void @@ -663,8 +655,6 @@ aue_cfg_reset_pegasus_II(struct aue_softc *sc) else #endif aue_cfg_csr_write_1(sc, AUE_REG_81, 2); - - return; } static void @@ -717,8 +707,6 @@ aue_cfg_reset(struct aue_softc *sc) } /* wait a little while for the chip to get its brains in order: */ usb2_config_td_sleep(&sc->sc_config_td, hz / 100); - - return; } /* @@ -961,7 +949,6 @@ aue_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~AUE_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1017,7 +1004,6 @@ aue_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~AUE_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1120,7 +1106,6 @@ aue_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~AUE_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1221,7 +1206,6 @@ aue_mchash(struct usb2_config_td_cc *cc, const uint8_t *ptr) h = ether_crc32_le(ptr, ETHER_ADDR_LEN) & ((1 << AUE_BITS) - 1); cc->if_hash[(h >> 3)] |= (1 << (h & 7)); - return; } static void @@ -1230,7 +1214,6 @@ aue_config_copy(struct aue_softc *sc, { bzero(cc, sizeof(*cc)); usb2_ether_cc(sc->sc_ifp, &aue_mchash, cc); - return; } static void @@ -1260,8 +1243,6 @@ aue_cfg_tick(struct aue_softc *sc, /* start stopped transfers, if any */ aue_start_transfers(sc); - - return; } static void @@ -1274,8 +1255,6 @@ aue_start_cb(struct ifnet *ifp) aue_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1287,8 +1266,6 @@ aue_init_cb(void *arg) usb2_config_td_queue_command (&sc->sc_config_td, &aue_cfg_pre_init, &aue_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1304,7 +1281,6 @@ aue_start_transfers(struct aue_softc *sc) usb2_transfer_start(sc->sc_xfer[1]); usb2_transfer_start(sc->sc_xfer[0]); } - return; } static void @@ -1320,7 +1296,6 @@ aue_cfg_pre_init(struct aue_softc *sc, ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_flags |= AUE_FLAG_HL_READY; - return; } static void @@ -1361,7 +1336,6 @@ aue_cfg_init(struct aue_softc *sc, AUE_FLAG_LL_READY); aue_start_transfers(sc); - return; } static void @@ -1374,7 +1348,6 @@ aue_cfg_promisc_upd(struct aue_softc *sc, } else { AUE_CFG_CLRBIT(sc, AUE_CTL2, AUE_CTL2_RX_PROMISC); } - return; } /* @@ -1415,8 +1388,6 @@ aue_cfg_ifmedia_upd(struct aue_softc *sc, } } mii_mediachg(mii); - - return; } /* @@ -1433,7 +1404,6 @@ aue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr) ifmr->ifm_status = sc->sc_media_status; mtx_unlock(&sc->sc_mtx); - return; } static int @@ -1507,7 +1477,6 @@ aue_watchdog(void *arg) hz, &aue_watchdog, sc); mtx_unlock(&sc->sc_mtx); - return; } /* @@ -1546,7 +1515,6 @@ aue_cfg_pre_stop(struct aue_softc *sc, usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[4]); usb2_transfer_stop(sc->sc_xfer[5]); - return; } static void @@ -1556,7 +1524,6 @@ aue_cfg_stop(struct aue_softc *sc, aue_cfg_csr_write_1(sc, AUE_CTL0, 0); aue_cfg_csr_write_1(sc, AUE_CTL1, 0); aue_cfg_reset(sc); - return; } /* diff --git a/sys/dev/usb2/ethernet/if_axe2.c b/sys/dev/usb2/ethernet/if_axe2.c index 35308bcc743c..408546add890 100644 --- a/sys/dev/usb2/ethernet/if_axe2.c +++ b/sys/dev/usb2/ethernet/if_axe2.c @@ -318,7 +318,6 @@ axe_cfg_cmd(struct axe_softc *sc, uint16_t cmd, uint16_t index, bzero(buf, length); } } - return; } static int @@ -438,7 +437,6 @@ axe_cfg_miibus_statchg(device_t dev) if (do_unlock) { mtx_unlock(&sc->sc_mtx); } - return; } /* @@ -479,8 +477,6 @@ axe_cfg_ifmedia_upd(struct axe_softc *sc, } } mii_mediachg(mii); - - return; } /* @@ -495,8 +491,6 @@ axe_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr) ifmr->ifm_active = sc->sc_media_active; ifmr->ifm_status = sc->sc_media_status; mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -506,7 +500,6 @@ axe_mchash(struct usb2_config_td_cc *cc, const uint8_t *ptr) h = (ether_crc32_be(ptr, ETHER_ADDR_LEN) >> 26); cc->if_hash[(h >> 3)] |= (1 << (h & 7)); - return; } static void @@ -515,7 +508,6 @@ axe_config_copy(struct axe_softc *sc, { bzero(cc, sizeof(*cc)); usb2_ether_cc(sc->sc_ifp, &axe_mchash, cc); - return; } static void @@ -537,8 +529,6 @@ axe_cfg_setmulti(struct axe_softc *sc, axe_cfg_cmd(sc, AXE_CMD_WRITE_MCAST, 0, 0, cc->if_hash); axe_cfg_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL); - - return; } static void @@ -558,8 +548,6 @@ axe_cfg_reset(struct axe_softc *sc) * wait a little while for the chip to get its brains in order: */ err = usb2_config_td_sleep(&sc->sc_config_td, hz / 100); - - return; } /* @@ -704,7 +692,6 @@ axe_cfg_ax88178_init(struct axe_softc *sc) err = usb2_config_td_sleep(&sc->sc_config_td, hz / 4); axe_cfg_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, 0, NULL); - return; } static void @@ -751,7 +738,6 @@ axe_cfg_ax88772_init(struct axe_softc *sc) err = usb2_config_td_sleep(&sc->sc_config_td, hz / 4); axe_cfg_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, 0, NULL); - return; } static void @@ -904,7 +890,6 @@ axe_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~AXE_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -947,7 +932,6 @@ axe_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~AXE_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } #if (AXE_BULK_BUF_SIZE >= 0x10000) @@ -1100,7 +1084,6 @@ axe_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~AXE_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } #if ((AXE_BULK_BUF_SIZE >= 0x10000) || (AXE_BULK_BUF_SIZE < (MCLBYTES+4))) @@ -1238,8 +1221,6 @@ axe_cfg_tick(struct axe_softc *sc, /* start stopped transfers, if any */ axe_start_transfers(sc); - - return; } static void @@ -1252,8 +1233,6 @@ axe_start_cb(struct ifnet *ifp) axe_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1269,7 +1248,6 @@ axe_start_transfers(struct axe_softc *sc) usb2_transfer_start(sc->sc_xfer[1]); usb2_transfer_start(sc->sc_xfer[0]); } - return; } static void @@ -1281,8 +1259,6 @@ axe_init_cb(void *arg) usb2_config_td_queue_command (&sc->sc_config_td, &axe_cfg_pre_init, &axe_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1298,7 +1274,6 @@ axe_cfg_pre_init(struct axe_softc *sc, ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_flags |= AXE_FLAG_HL_READY; - return; } static void @@ -1356,8 +1331,6 @@ axe_cfg_init(struct axe_softc *sc, AXE_FLAG_LL_READY); axe_start_transfers(sc); - - return; } static void @@ -1379,8 +1352,6 @@ axe_cfg_promisc_upd(struct axe_softc *sc, axe_cfg_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL); axe_cfg_setmulti(sc, cc, 0); - - return; } static int @@ -1454,7 +1425,6 @@ axe_watchdog(void *arg) hz, &axe_watchdog, sc); mtx_unlock(&sc->sc_mtx); - return; } /* @@ -1490,7 +1460,6 @@ axe_cfg_pre_stop(struct axe_softc *sc, usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[4]); usb2_transfer_stop(sc->sc_xfer[5]); - return; } static void @@ -1498,7 +1467,6 @@ axe_cfg_stop(struct axe_softc *sc, struct usb2_config_td_cc *cc, uint16_t refcount) { axe_cfg_reset(sc); - return; } /* diff --git a/sys/dev/usb2/ethernet/if_cdce2.c b/sys/dev/usb2/ethernet/if_cdce2.c index 1074c277f83a..81e8a92d2ed3 100644 --- a/sys/dev/usb2/ethernet/if_cdce2.c +++ b/sys/dev/usb2/ethernet/if_cdce2.c @@ -524,8 +524,6 @@ cdce_start_cb(struct ifnet *ifp) cdce_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -540,7 +538,6 @@ cdce_start_transfers(struct cdce_softc *sc) usb2_transfer_start(sc->sc_xfer[1]); usb2_transfer_start(sc->sc_xfer[0]); } - return; } static uint32_t @@ -576,7 +573,6 @@ cdce_fwd_mq(struct cdce_softc *sc, struct cdce_mq *mq) mtx_lock(&sc->sc_mtx); } - return; } static void @@ -596,7 +592,6 @@ cdce_free_mq(struct cdce_mq *mq) m_freem(m); } } - return; } static void @@ -713,7 +708,6 @@ cdce_bulk_write_512x4_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -802,7 +796,6 @@ cdce_bulk_write_std_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -818,7 +811,6 @@ cdce_bulk_write_callback(struct usb2_xfer *xfer) xfer->callback = &cdce_bulk_write_std_callback; } (xfer->callback) (xfer); - return; } static int32_t @@ -863,7 +855,6 @@ cdce_stop(struct cdce_softc *sc) */ usb2_transfer_stop(sc->sc_xfer[0]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static int @@ -954,8 +945,6 @@ cdce_init_cb(void *arg) cdce_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1169,7 +1158,6 @@ cdce_bulk_read_512x4_callback(struct usb2_xfer *xfer) if (free_mq) { cdce_free_mq(&sc->sc_rx_mq); } - return; } static void @@ -1256,7 +1244,6 @@ cdce_bulk_read_std_callback(struct usb2_xfer *xfer) (ifp->if_input) (ifp, m_rx); mtx_lock(&sc->sc_mtx); } - return; } static void @@ -1271,7 +1258,6 @@ cdce_bulk_read_callback(struct usb2_xfer *xfer) xfer->callback = &cdce_bulk_read_std_callback; } (xfer->callback) (xfer); - return; } static int @@ -1315,7 +1301,6 @@ cdce_intr_read_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -1343,7 +1328,6 @@ cdce_intr_write_callback(struct usb2_xfer *xfer) } break; } - return; } static int diff --git a/sys/dev/usb2/ethernet/if_cue2.c b/sys/dev/usb2/ethernet/if_cue2.c index a56b1010ae3f..e3ff6875cc11 100644 --- a/sys/dev/usb2/ethernet/if_cue2.c +++ b/sys/dev/usb2/ethernet/if_cue2.c @@ -227,7 +227,6 @@ cue_cfg_do_request(struct cue_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } #define CUE_CFG_SETBIT(sc, reg, x) \ @@ -280,7 +279,6 @@ cue_cfg_csr_write_1(struct cue_softc *sc, uint16_t reg, uint16_t val) USETW(req.wLength, 0); cue_cfg_do_request(sc, &req, NULL); - return; } static void @@ -300,7 +298,6 @@ cue_cfg_mem(struct cue_softc *sc, uint8_t cmd, uint16_t addr, USETW(req.wLength, len); cue_cfg_do_request(sc, &req, buf); - return; } static void @@ -315,7 +312,6 @@ cue_cfg_getmac(struct cue_softc *sc, void *buf) USETW(req.wLength, ETHER_ADDR_LEN); cue_cfg_do_request(sc, &req, buf); - return; } #define CUE_BITS 9 @@ -328,7 +324,6 @@ cue_mchash(struct usb2_config_td_cc *cc, const uint8_t *addr) h = ether_crc32_le(addr, ETHER_ADDR_LEN) & ((1 << CUE_BITS) - 1); cc->if_hash[h >> 3] |= 1 << (h & 0x7); - return; } static void @@ -347,7 +342,6 @@ cue_cfg_promisc_upd(struct cue_softc *sc, cue_cfg_mem(sc, CUE_CMD_WRITESRAM, CUE_MCAST_TABLE_ADDR, cc->if_hash, CUE_MCAST_TABLE_LEN); - return; } static void @@ -356,7 +350,6 @@ cue_config_copy(struct cue_softc *sc, { bzero(cc, sizeof(*cc)); usb2_ether_cc(sc->sc_ifp, &cue_mchash, cc); - return; } static void @@ -377,7 +370,6 @@ cue_cfg_reset(struct cue_softc *sc) */ (void)usb2_config_td_sleep(&sc->sc_config_td, hz / 100); - return; } static int @@ -554,7 +546,6 @@ cue_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~CUE_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -649,8 +640,6 @@ cue_cfg_tick(struct cue_softc *sc, /* start stopped transfers, if any */ cue_start_transfers(sc); - - return; } static void @@ -663,8 +652,6 @@ cue_start_cb(struct ifnet *ifp) cue_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -679,7 +666,6 @@ cue_start_transfers(struct cue_softc *sc) usb2_transfer_start(sc->sc_xfer[1]); usb2_transfer_start(sc->sc_xfer[0]); } - return; } static void @@ -693,7 +679,6 @@ cue_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~CUE_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -774,8 +759,6 @@ cue_init_cb(void *arg) (&sc->sc_config_td, &cue_cfg_pre_init, &cue_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -791,8 +774,6 @@ cue_cfg_pre_init(struct cue_softc *sc, ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_flags |= CUE_FLAG_HL_READY; - - return; } static void @@ -839,7 +820,6 @@ cue_cfg_init(struct cue_softc *sc, CUE_FLAG_LL_READY); cue_start_transfers(sc); - return; } static int @@ -901,7 +881,6 @@ cue_watchdog(void *arg) hz, &cue_watchdog, sc); mtx_unlock(&sc->sc_mtx); - return; } /* @@ -934,7 +913,6 @@ cue_cfg_pre_stop(struct cue_softc *sc, usb2_transfer_stop(sc->sc_xfer[1]); usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[3]); - return; } static void @@ -943,7 +921,6 @@ cue_cfg_stop(struct cue_softc *sc, { cue_cfg_csr_write_1(sc, CUE_ETHCTL, 0); cue_cfg_reset(sc); - return; } /* diff --git a/sys/dev/usb2/ethernet/if_kue2.c b/sys/dev/usb2/ethernet/if_kue2.c index 15b14ce74f6d..16232f73aca7 100644 --- a/sys/dev/usb2/ethernet/if_kue2.c +++ b/sys/dev/usb2/ethernet/if_kue2.c @@ -274,7 +274,6 @@ kue_cfg_do_request(struct kue_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } static void @@ -289,7 +288,6 @@ kue_cfg_setword(struct kue_softc *sc, uint8_t breq, uint16_t word) USETW(req.wLength, 0); kue_cfg_do_request(sc, &req, NULL); - return; } static void @@ -310,7 +308,6 @@ kue_cfg_ctl(struct kue_softc *sc, uint8_t rw, uint8_t breq, USETW(req.wLength, len); kue_cfg_do_request(sc, &req, data); - return; } static void @@ -350,7 +347,6 @@ kue_cfg_load_fw(struct kue_softc *sc) /* send trigger command */ kue_cfg_ctl(sc, KUE_CTL_WRITE, KUE_CMD_SEND_SCAN, 0, kue_trig_seg, sizeof(kue_trig_seg)); - return; } static void @@ -361,8 +357,6 @@ kue_cfg_promisc_upd(struct kue_softc *sc, cc->if_nhash, cc->if_hash, cc->if_nhash * ETHER_ADDR_LEN); kue_cfg_setword(sc, KUE_CMD_SET_PKT_FILTER, cc->if_rxfilt); - - return; } static void @@ -382,7 +376,6 @@ kue_mchash(struct usb2_config_td_cc *cc, const uint8_t *ptr) bcopy(ptr, cc->if_hash + (i * ETHER_ADDR_LEN), ETHER_ADDR_LEN); cc->if_nhash++; } - return; } static void @@ -408,7 +401,6 @@ kue_config_copy(struct kue_softc *sc, } else if (cc->if_nhash) { cc->if_rxfilt |= KUE_RXFILT_MULTICAST; } - return; } /* @@ -433,8 +425,6 @@ kue_cfg_reset(struct kue_softc *sc) * wait a little while for the chip to get its brains in order: */ err = usb2_config_td_sleep(&sc->sc_config_td, hz / 100); - - return; } /* @@ -627,7 +617,6 @@ kue_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~KUE_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -713,7 +702,6 @@ kue_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~KUE_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -802,8 +790,6 @@ kue_start_cb(struct ifnet *ifp) kue_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -818,7 +804,6 @@ kue_start_transfers(struct kue_softc *sc) usb2_transfer_start(sc->sc_xfer[1]); usb2_transfer_start(sc->sc_xfer[0]); } - return; } static void @@ -831,8 +816,6 @@ kue_init_cb(void *arg) (&sc->sc_config_td, &kue_cfg_pre_init, &kue_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -848,8 +831,6 @@ kue_cfg_pre_init(struct kue_softc *sc, ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_flags |= KUE_FLAG_HL_READY; - - return; } static void @@ -878,7 +859,6 @@ kue_cfg_init(struct kue_softc *sc, KUE_FLAG_LL_READY); kue_start_transfers(sc); - return; } static int @@ -939,8 +919,6 @@ kue_cfg_tick(struct kue_softc *sc, /* start stopped transfers, if any */ kue_start_transfers(sc); - - return; } /* @@ -959,7 +937,6 @@ kue_watchdog(void *arg) hz, &kue_watchdog, sc); mtx_unlock(&sc->sc_mtx); - return; } static void @@ -988,7 +965,6 @@ kue_cfg_pre_stop(struct kue_softc *sc, usb2_transfer_stop(sc->sc_xfer[1]); usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[3]); - return; } static void diff --git a/sys/dev/usb2/ethernet/if_rue2.c b/sys/dev/usb2/ethernet/if_rue2.c index 72c8852ff9f2..49031b48111f 100644 --- a/sys/dev/usb2/ethernet/if_rue2.c +++ b/sys/dev/usb2/ethernet/if_rue2.c @@ -279,7 +279,6 @@ rue_cfg_do_request(struct rue_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } #define RUE_CFG_SETBIT(sc, reg, x) \ @@ -301,7 +300,6 @@ rue_cfg_read_mem(struct rue_softc *sc, uint16_t addr, void *buf, USETW(req.wLength, len); rue_cfg_do_request(sc, &req, buf); - return; } static void @@ -317,7 +315,6 @@ rue_cfg_write_mem(struct rue_softc *sc, uint16_t addr, void *buf, USETW(req.wLength, len); rue_cfg_do_request(sc, &req, buf); - return; } static uint8_t @@ -342,7 +339,6 @@ static void rue_cfg_csr_write_1(struct rue_softc *sc, uint16_t reg, uint8_t val) { rue_cfg_write_mem(sc, reg, &val, 1); - return; } static void @@ -352,7 +348,6 @@ rue_cfg_csr_write_2(struct rue_softc *sc, uint16_t reg, uint16_t val) USETW(temp, val); rue_cfg_write_mem(sc, reg, &temp, 2); - return; } static void @@ -362,7 +357,6 @@ rue_cfg_csr_write_4(struct rue_softc *sc, int reg, uint32_t val) USETDW(temp, val); rue_cfg_write_mem(sc, reg, &temp, 4); - return; } static int @@ -525,7 +519,6 @@ rue_cfg_miibus_statchg(device_t dev) mtx_unlock(&sc->sc_mtx); } #endif - return; } static void @@ -536,7 +529,6 @@ rue_mchash(struct usb2_config_td_cc *cc, const uint8_t *ptr) h = ether_crc32_be(ptr, ETHER_ADDR_LEN) >> 26; cc->if_hash[h / 8] |= 1 << (h & 7); cc->if_nhash = 1; - return; } static void @@ -545,7 +537,6 @@ rue_config_copy(struct rue_softc *sc, { bzero(cc, sizeof(*cc)); usb2_ether_cc(sc->sc_ifp, &rue_mchash, cc); - return; } /* @@ -582,7 +573,6 @@ rue_cfg_promisc_upd(struct rue_softc *sc, rue_cfg_csr_write_2(sc, RUE_RCR, rxcfg); rue_cfg_write_mem(sc, RUE_MAR0, cc->if_hash, 4); rue_cfg_write_mem(sc, RUE_MAR4, cc->if_hash + 4, 4); - return; } static void @@ -613,7 +603,6 @@ rue_cfg_reset(struct rue_softc *sc) } err = usb2_config_td_sleep(&sc->sc_config_td, hz / 100); - return; } /* @@ -827,7 +816,6 @@ rue_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~RUE_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -879,7 +867,6 @@ rue_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~RUE_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -974,7 +961,6 @@ rue_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~RUE_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1083,8 +1069,6 @@ rue_cfg_tick(struct rue_softc *sc, /* start stopped transfers, if any */ rue_start_transfers(sc); - - return; } static void @@ -1097,8 +1081,6 @@ rue_start_cb(struct ifnet *ifp) rue_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1114,7 +1096,6 @@ rue_start_transfers(struct rue_softc *sc) usb2_transfer_start(sc->sc_xfer[1]); usb2_transfer_start(sc->sc_xfer[0]); } - return; } static void @@ -1127,8 +1108,6 @@ rue_init_cb(void *arg) (&sc->sc_config_td, &rue_cfg_pre_init, &rue_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1144,8 +1123,6 @@ rue_cfg_pre_init(struct rue_softc *sc, ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_flags |= RUE_FLAG_HL_READY; - - return; } static void @@ -1193,8 +1170,6 @@ rue_cfg_init(struct rue_softc *sc, RUE_FLAG_LL_READY); rue_start_transfers(sc); - - return; } /* @@ -1236,8 +1211,6 @@ rue_cfg_ifmedia_upd(struct rue_softc *sc, } } mii_mediachg(mii); - - return; } /* @@ -1254,8 +1227,6 @@ rue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr) ifmr->ifm_status = sc->sc_media_status; mtx_unlock(&sc->sc_mtx); - - return; } static int @@ -1330,7 +1301,6 @@ rue_watchdog(void *arg) hz, &rue_watchdog, sc); mtx_unlock(&sc->sc_mtx); - return; } /* @@ -1366,7 +1336,6 @@ rue_cfg_pre_stop(struct rue_softc *sc, usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[4]); usb2_transfer_stop(sc->sc_xfer[5]); - return; } static void @@ -1376,7 +1345,6 @@ rue_cfg_stop(struct rue_softc *sc, rue_cfg_csr_write_1(sc, RUE_CR, 0x00); rue_cfg_reset(sc); - return; } /* diff --git a/sys/dev/usb2/ethernet/if_udav2.c b/sys/dev/usb2/ethernet/if_udav2.c index 2973f6e86752..9514840f91f9 100644 --- a/sys/dev/usb2/ethernet/if_udav2.c +++ b/sys/dev/usb2/ethernet/if_udav2.c @@ -460,7 +460,6 @@ udav_cfg_do_request(struct udav_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } #if 0 @@ -479,7 +478,6 @@ udav_cfg_mem_read(struct udav_softc *sc, uint16_t offset, void *buf, USETW(req.wLength, len); udav_cfg_do_request(sc, &req, buf); - return; } static void @@ -497,7 +495,6 @@ udav_cfg_mem_write(struct udav_softc *sc, uint16_t offset, void *buf, USETW(req.wLength, len); udav_cfg_do_request(sc, &req, buf); - return; } static void @@ -513,7 +510,6 @@ udav_cfg_mem_write1(struct udav_softc *sc, uint16_t offset, USETW(req.wLength, 0x0000); udav_cfg_do_request(sc, &req, NULL); - return; } #endif @@ -533,7 +529,6 @@ udav_cfg_csr_read(struct udav_softc *sc, uint16_t offset, void *buf, USETW(req.wLength, len); udav_cfg_do_request(sc, &req, buf); - return; } static void @@ -552,7 +547,6 @@ udav_cfg_csr_write(struct udav_softc *sc, uint16_t offset, void *buf, USETW(req.wLength, len); udav_cfg_do_request(sc, &req, buf); - return; } static uint8_t @@ -579,7 +573,6 @@ udav_cfg_csr_write1(struct udav_softc *sc, uint16_t offset, USETW(req.wLength, 0x0000); udav_cfg_do_request(sc, &req, NULL); - return; } static void @@ -592,8 +585,6 @@ udav_init_cb(void *arg) (&sc->sc_config_td, &udav_cfg_pre_init, &udav_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -609,8 +600,6 @@ udav_cfg_pre_init(struct udav_softc *sc, ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_flags |= UDAV_FLAG_HL_READY; - - return; } static void @@ -655,8 +644,6 @@ udav_cfg_init(struct udav_softc *sc, UDAV_FLAG_LL_READY); udav_start_transfers(sc); - - return; } static void @@ -702,8 +689,6 @@ udav_cfg_reset(struct udav_softc *sc) } err = usb2_config_td_sleep(&sc->sc_config_td, hz / 100); - - return; } #define UDAV_BITS 6 @@ -716,7 +701,6 @@ udav_mchash(struct usb2_config_td_cc *cc, const uint8_t *ptr) h = ether_crc32_le(ptr, ETHER_ADDR_LEN) & ((1 << UDAV_BITS) - 1); cc->if_hash[h >> 3] |= 1 << (h & 0x7); - return; } static void @@ -725,7 +709,6 @@ udav_config_copy(struct udav_softc *sc, { bzero(cc, sizeof(*cc)); usb2_ether_cc(sc->sc_ifp, &udav_mchash, cc); - return; } static void @@ -751,8 +734,6 @@ udav_cfg_promisc_upd(struct udav_softc *sc, /* write new mode bits */ udav_cfg_csr_write1(sc, UDAV_RCR, rxmode); - - return; } static void @@ -765,8 +746,6 @@ udav_start_cb(struct ifnet *ifp) udav_start_transfers(sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -782,7 +761,6 @@ udav_start_transfers(struct udav_softc *sc) usb2_transfer_start(sc->sc_xfer[1]); usb2_transfer_start(sc->sc_xfer[0]); } - return; } static void @@ -796,7 +774,6 @@ udav_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UDAV_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -901,7 +878,6 @@ udav_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UDAV_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1006,7 +982,6 @@ udav_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UDAV_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1107,7 +1082,6 @@ udav_watchdog(void *arg) hz, &udav_watchdog, sc); mtx_unlock(&sc->sc_mtx); - return; } /* @@ -1143,7 +1117,6 @@ udav_cfg_pre_stop(struct udav_softc *sc, usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[4]); usb2_transfer_stop(sc->sc_xfer[5]); - return; } /* @@ -1154,7 +1127,6 @@ udav_cfg_stop(struct udav_softc *sc, struct usb2_config_td_cc *cc, uint16_t refcount) { udav_cfg_reset(sc); - return; } static int @@ -1193,8 +1165,6 @@ udav_cfg_ifmedia_change(struct udav_softc *sc, } } mii_mediachg(mii); - - return; } static void @@ -1213,8 +1183,6 @@ udav_ifmedia_status_cb(struct ifnet *ifp, struct ifmediareq *ifmr) } mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1244,8 +1212,6 @@ udav_cfg_tick(struct udav_softc *sc, /* start stopped transfers, if any */ udav_start_transfers(sc); - - return; } static int @@ -1340,7 +1306,6 @@ static void udav_cfg_miibus_statchg(device_t dev) { /* nothing to do */ - return; } /* diff --git a/sys/dev/usb2/ethernet/usb2_ethernet.c b/sys/dev/usb2/ethernet/usb2_ethernet.c index 6651e0b5a176..57a0ddebb71a 100644 --- a/sys/dev/usb2/ethernet/usb2_ethernet.c +++ b/sys/dev/usb2/ethernet/usb2_ethernet.c @@ -97,5 +97,4 @@ usb2_ether_cc(struct ifnet *ifp, usb2_ether_mchash_t *fhash, fhash(cc, ifp->if_broadcastaddr); } } - return; } diff --git a/sys/dev/usb2/image/uscanner2.c b/sys/dev/usb2/image/uscanner2.c index 89056ea0f342..fa939ef63f76 100644 --- a/sys/dev/usb2/image/uscanner2.c +++ b/sys/dev/usb2/image/uscanner2.c @@ -466,7 +466,6 @@ uscanner_read_callback(struct usb2_xfer *xfer) } break; } - return; } /* @@ -483,7 +482,6 @@ uscanner_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~USCANNER_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } /* @@ -527,7 +525,6 @@ uscanner_write_callback(struct usb2_xfer *xfer) } break; } - return; } /* @@ -544,7 +541,6 @@ uscanner_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~USCANNER_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } /* @@ -588,7 +584,6 @@ uscanner_close(struct usb2_fifo *fifo, int fflags, struct thread *td) if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); } - return; } /* diff --git a/sys/dev/usb2/input/uhid2.c b/sys/dev/usb2/input/uhid2.c index f5111f5e79e4..7eec66c1f808 100644 --- a/sys/dev/usb2/input/uhid2.c +++ b/sys/dev/usb2/input/uhid2.c @@ -199,7 +199,6 @@ uhid_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UHID_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -212,7 +211,6 @@ uhid_fill_set_report(struct usb2_device_request *req, uint8_t iface_no, req->wIndex[0] = iface_no; req->wIndex[1] = 0; USETW(req->wLength, size); - return; } static void @@ -225,7 +223,6 @@ uhid_fill_get_report(struct usb2_device_request *req, uint8_t iface_no, req->wIndex[0] = iface_no; req->wIndex[1] = 0; USETW(req->wLength, size); - return; } static void @@ -376,7 +373,6 @@ uhid_start_read(struct usb2_fifo *fifo) } else { usb2_transfer_start(sc->sc_xfer[0]); } - return; } static void @@ -386,7 +382,6 @@ uhid_stop_read(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static void @@ -395,7 +390,6 @@ uhid_start_write(struct usb2_fifo *fifo) struct uhid_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[2]); - return; } static void @@ -404,7 +398,6 @@ uhid_stop_write(struct usb2_fifo *fifo) struct uhid_softc *sc = fifo->priv_sc0; usb2_transfer_stop(sc->sc_xfer[2]); - return; } static int @@ -509,7 +502,6 @@ uhid_close(struct usb2_fifo *fifo, int fflags, struct thread *td) if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); } - return; } static int diff --git a/sys/dev/usb2/input/ukbd2.c b/sys/dev/usb2/input/ukbd2.c index fb6324f40731..52d9dbe097a0 100644 --- a/sys/dev/usb2/input/ukbd2.c +++ b/sys/dev/usb2/input/ukbd2.c @@ -276,7 +276,6 @@ ukbd_put_key(struct ukbd_softc *sc, uint32_t key) } else { DPRINTF("input buffer is full\n"); } - return; } static int32_t @@ -448,8 +447,6 @@ ukbd_timeout(void *arg) usb2_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc); mtx_unlock(&Giant); - - return; } static void @@ -463,7 +460,6 @@ ukbd_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UKBD_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1319,7 +1315,6 @@ ukbd_clear_state(keyboard_t *kbd) bzero(&sc->sc_odata, sizeof(sc->sc_odata)); bzero(&sc->sc_ntime, sizeof(sc->sc_ntime)); bzero(&sc->sc_otime, sizeof(sc->sc_otime)); - return; } /* save the internal state, not used */ @@ -1369,8 +1364,6 @@ ukbd_set_leds(struct ukbd_softc *sc, uint8_t leds) /* start transfer, if not already started */ usb2_transfer_start(sc->sc_xfer[2]); - - return; } static int diff --git a/sys/dev/usb2/input/ums2.c b/sys/dev/usb2/input/ums2.c index a04e7c849b0e..7dbcd1c242b0 100644 --- a/sys/dev/usb2/input/ums2.c +++ b/sys/dev/usb2/input/ums2.c @@ -155,8 +155,6 @@ ums_put_queue_timeout(void *__sc) ums_put_queue(sc, 0, 0, 0, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -170,7 +168,6 @@ ums_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UMS_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -664,7 +661,6 @@ ums_start_read(struct usb2_fifo *fifo) struct ums_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -675,7 +671,6 @@ ums_stop_read(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[1]); usb2_transfer_stop(sc->sc_xfer[0]); usb2_callout_stop(&sc->sc_callout); - return; } @@ -727,8 +722,6 @@ ums_put_queue(struct ums_softc *sc, int32_t dx, int32_t dy, } else { DPRINTF("Buffer full, discarded packet\n"); } - - return; } static void @@ -736,7 +729,6 @@ ums_reset_buf(struct ums_softc *sc) { /* reset read queue */ usb2_fifo_reset(sc->sc_fifo.fp[USB_FIFO_RX]); - return; } static int @@ -772,7 +764,6 @@ ums_close(struct usb2_fifo *fifo, int fflags, struct thread *td) if (fflags & FREAD) { usb2_fifo_free_buffer(fifo); } - return; } static int diff --git a/sys/dev/usb2/misc/udbp2.c b/sys/dev/usb2/misc/udbp2.c index 5a7d320eb4d0..03e4d6ca56d1 100644 --- a/sys/dev/usb2/misc/udbp2.c +++ b/sys/dev/usb2/misc/udbp2.c @@ -467,7 +467,6 @@ udbp_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UDBP_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -508,8 +507,6 @@ udbp_bulk_read_complete(node_p node, hook_p hook, void *arg1, int arg2) usb2_transfer_start(sc->sc_xfer[UDBP_T_RD]); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -578,7 +575,6 @@ udbp_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UDBP_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } /*********************************************************************** diff --git a/sys/dev/usb2/quirk/usb2_quirk.c b/sys/dev/usb2/quirk/usb2_quirk.c index fbaef206d008..d1aa73231d88 100644 --- a/sys/dev/usb2/quirk/usb2_quirk.c +++ b/sys/dev/usb2/quirk/usb2_quirk.c @@ -356,7 +356,6 @@ usb2_quirk_init(void *arg) /* register our function */ usb2_test_quirk_p = &usb2_test_quirk_by_info; usb2_quirk_ioctl_p = &usb2_quirk_ioctl; - return; } static void @@ -366,7 +365,6 @@ usb2_quirk_uninit(void *arg) /* destroy mutex */ mtx_destroy(&usb2_quirk_mtx); - return; } SYSINIT(usb2_quirk_init, SI_SUB_LOCK, SI_ORDER_FIRST, usb2_quirk_init, NULL); diff --git a/sys/dev/usb2/serial/uark2.c b/sys/dev/usb2/serial/uark2.c index f98a729d49bc..bd775b4ee803 100644 --- a/sys/dev/usb2/serial/uark2.c +++ b/sys/dev/usb2/serial/uark2.c @@ -291,7 +291,6 @@ uark_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UARK_FLAG_BULK_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -334,7 +333,6 @@ uark_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UARK_FLAG_BULK_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -343,7 +341,6 @@ uark_start_read(struct usb2_com_softc *ucom) struct uark_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -353,7 +350,6 @@ uark_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -362,7 +358,6 @@ uark_start_write(struct usb2_com_softc *ucom) struct uark_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -372,7 +367,6 @@ uark_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static int @@ -431,7 +425,6 @@ uark_cfg_param(struct usb2_com_softc *ucom, struct termios *t) } uark_cfg_write(sc, 3, 0x00); uark_cfg_write(sc, 3, data); - return; } static void @@ -441,7 +434,6 @@ uark_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static void @@ -452,7 +444,6 @@ uark_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) DPRINTF("onoff=%d\n", onoff); uark_cfg_write(sc, 4, onoff ? 0x01 : 0x00); - return; } static void @@ -477,5 +468,4 @@ uark_cfg_write(struct uark_softc *sc, uint16_t index, uint16_t value) DPRINTFN(0, "device request failed, err=%s " "(ignored)\n", usb2_errstr(err)); } - return; } diff --git a/sys/dev/usb2/serial/ubsa2.c b/sys/dev/usb2/serial/ubsa2.c index cca3a884cacb..6e84e39fc7b1 100644 --- a/sys/dev/usb2/serial/ubsa2.c +++ b/sys/dev/usb2/serial/ubsa2.c @@ -391,7 +391,6 @@ ubsa_cfg_request(struct ubsa_softc *sc, uint8_t index, uint16_t value) DPRINTFN(0, "device request failed, err=%s " "(ignored)\n", usb2_errstr(err)); } - return; } static void @@ -402,7 +401,6 @@ ubsa_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) DPRINTF("onoff = %d\n", onoff); ubsa_cfg_request(sc, UBSA_REG_DTR, onoff ? 1 : 0); - return; } static void @@ -413,7 +411,6 @@ ubsa_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) DPRINTF("onoff = %d\n", onoff); ubsa_cfg_request(sc, UBSA_REG_RTS, onoff ? 1 : 0); - return; } static void @@ -424,7 +421,6 @@ ubsa_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) DPRINTF("onoff = %d\n", onoff); ubsa_cfg_request(sc, UBSA_REG_BREAK, onoff ? 1 : 0); - return; } static int @@ -523,7 +519,6 @@ ubsa_cfg_param(struct usb2_com_softc *ucom, struct termios *t) value |= UBSA_FLOW_OXON | UBSA_FLOW_IXON; ubsa_cfg_request(sc, UBSA_REG_FLOW_CTRL, value); - return; } static void @@ -536,7 +531,6 @@ ubsa_start_read(struct usb2_com_softc *ucom) /* start read endpoint */ usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -551,7 +545,6 @@ ubsa_stop_read(struct usb2_com_softc *ucom) /* stop read endpoint */ usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -560,7 +553,6 @@ ubsa_start_write(struct usb2_com_softc *ucom) struct ubsa_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -570,7 +562,6 @@ ubsa_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static void @@ -582,7 +573,6 @@ ubsa_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static void @@ -627,7 +617,6 @@ ubsa_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UBSA_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -669,7 +658,6 @@ ubsa_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UBSA_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -731,5 +719,4 @@ ubsa_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UBSA_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } diff --git a/sys/dev/usb2/serial/ubser2.c b/sys/dev/usb2/serial/ubser2.c index b557c26672f2..6435796df218 100644 --- a/sys/dev/usb2/serial/ubser2.c +++ b/sys/dev/usb2/serial/ubser2.c @@ -408,7 +408,6 @@ ubser_inc_tx_unit(struct ubser_softc *sc) if (sc->sc_curr_tx_unit >= sc->sc_numser) { sc->sc_curr_tx_unit = 0; } - return; } static void @@ -422,7 +421,6 @@ ubser_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UBSER_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -483,7 +481,6 @@ ubser_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UBSER_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -553,7 +550,6 @@ ubser_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) usb2_errstr(err)); } } - return; } static void @@ -562,7 +558,6 @@ ubser_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) /* fake status bits */ *lsr = 0; *msr = SER_DCD; - return; } static void @@ -571,7 +566,6 @@ ubser_start_read(struct usb2_com_softc *ucom) struct ubser_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[UBSER_TR_DT_READ]); - return; } static void @@ -581,7 +575,6 @@ ubser_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[UBSER_TR_CS_READ]); usb2_transfer_stop(sc->sc_xfer[UBSER_TR_DT_READ]); - return; } static void @@ -590,7 +583,6 @@ ubser_start_write(struct usb2_com_softc *ucom) struct ubser_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[UBSER_TR_DT_WRITE]); - return; } static void @@ -600,5 +592,4 @@ ubser_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[UBSER_TR_CS_WRITE]); usb2_transfer_stop(sc->sc_xfer[UBSER_TR_DT_WRITE]); - return; } diff --git a/sys/dev/usb2/serial/uchcom2.c b/sys/dev/usb2/serial/uchcom2.c index e9d4a4300567..2a49c72619ad 100644 --- a/sys/dev/usb2/serial/uchcom2.c +++ b/sys/dev/usb2/serial/uchcom2.c @@ -436,7 +436,6 @@ uchcom_do_request(struct uchcom_softc *sc, bzero(USB_ADD_BYTES(data, actlen), length - actlen); } } - return; } static void @@ -452,7 +451,6 @@ uchcom_ctrl_write(struct uchcom_softc *sc, uint8_t reqno, USETW(req.wLength, 0); uchcom_do_request(sc, &req, NULL); - return; } static void @@ -468,7 +466,6 @@ uchcom_ctrl_read(struct uchcom_softc *sc, uint8_t reqno, USETW(req.wLength, buflen); uchcom_do_request(sc, &req, buf); - return; } static void @@ -481,7 +478,6 @@ uchcom_write_reg(struct uchcom_softc *sc, uchcom_ctrl_write( sc, UCHCOM_REQ_WRITE_REG, reg1 | ((uint16_t)reg2 << 8), val1 | ((uint16_t)val2 << 8)); - return; } static void @@ -502,8 +498,6 @@ uchcom_read_reg(struct uchcom_softc *sc, *rval1 = buf[0]; if (rval2) *rval2 = buf[1]; - - return; } static void @@ -516,29 +510,24 @@ uchcom_get_version(struct uchcom_softc *sc, uint8_t *rver) if (rver) *rver = buf[0]; - - return; } static void uchcom_get_status(struct uchcom_softc *sc, uint8_t *rval) { uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); - return; } static void uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) { uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); - return; } static void uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) { uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); - return; } @@ -550,7 +539,6 @@ static void uchcom_update_version(struct uchcom_softc *sc) { uchcom_get_version(sc, &sc->sc_version); - return; } static void @@ -570,7 +558,6 @@ uchcom_update_status(struct uchcom_softc *sc) uchcom_get_status(sc, &cur); uchcom_convert_status(sc, cur); - return; } @@ -588,8 +575,6 @@ uchcom_set_dtrrts(struct uchcom_softc *sc) uchcom_set_dtrrts_10(sc, ~val); else uchcom_set_dtrrts_20(sc, ~val); - - return; } static void @@ -610,8 +595,6 @@ uchcom_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) brk2 |= UCHCOM_BRK2_MASK; } uchcom_write_reg(sc, UCHCOM_REG_BREAK1, brk1, UCHCOM_REG_BREAK2, brk2); - - return; } static int @@ -669,7 +652,6 @@ uchcom_set_dte_rate(struct uchcom_softc *sc, uint32_t rate) uchcom_write_reg(sc, UCHCOM_REG_BPS_MOD, dv.dv_mod, UCHCOM_REG_BPS_PAD, 0); - return; } static void @@ -700,8 +682,6 @@ uchcom_set_line_control(struct uchcom_softc *sc, tcflag_t cflag) lcr2 |= UCHCOM_LCR2_PAREVEN; } uchcom_write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); - - return; } static void @@ -709,7 +689,6 @@ uchcom_clear_chip(struct uchcom_softc *sc) { DPRINTF("\n"); uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0, 0); - return; } static void @@ -743,8 +722,6 @@ uchcom_reset_chip(struct uchcom_softc *sc) DPRINTF("reset v=0x%04X, i=0x%04X\n", val, idx); uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); - - return; } /* ---------------------------------------------------------------------- @@ -759,7 +736,6 @@ uchcom_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static int @@ -778,7 +754,6 @@ uchcom_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_dtr = onoff; uchcom_set_dtrrts(sc); - return; } static void @@ -790,7 +765,6 @@ uchcom_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_rts = onoff; uchcom_set_dtrrts(sc); - return; } static int @@ -820,7 +794,6 @@ uchcom_cfg_param(struct usb2_com_softc *ucom, struct termios *t) uchcom_set_line_control(sc, t->c_cflag); uchcom_set_dte_rate(sc, t->c_ospeed); - return; } static void @@ -833,7 +806,6 @@ uchcom_start_read(struct usb2_com_softc *ucom) /* start read endpoint */ usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -847,7 +819,6 @@ uchcom_stop_read(struct usb2_com_softc *ucom) /* stop read endpoint */ usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -856,7 +827,6 @@ uchcom_start_write(struct usb2_com_softc *ucom) struct uchcom_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -866,7 +836,6 @@ uchcom_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } /* ---------------------------------------------------------------------- @@ -910,7 +879,6 @@ uchcom_intr_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -924,7 +892,6 @@ uchcom_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UCHCOM_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -971,7 +938,6 @@ uchcom_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UCHCOM_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1013,7 +979,6 @@ uchcom_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UCHCOM_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static device_method_t uchcom_methods[] = { diff --git a/sys/dev/usb2/serial/ucycom2.c b/sys/dev/usb2/serial/ucycom2.c index 1f5380725322..78a1ec03b85c 100644 --- a/sys/dev/usb2/serial/ucycom2.c +++ b/sys/dev/usb2/serial/ucycom2.c @@ -307,7 +307,6 @@ ucycom_cfg_open(struct usb2_com_softc *ucom) /* set default configuration */ ucycom_cfg_write(sc, UCYCOM_DEFAULT_RATE, UCYCOM_DEFAULT_CFG); - return; } static void @@ -316,7 +315,6 @@ ucycom_start_read(struct usb2_com_softc *ucom) struct ucycom_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -326,7 +324,6 @@ ucycom_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -335,7 +332,6 @@ ucycom_start_write(struct usb2_com_softc *ucom) struct ucycom_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -344,7 +340,6 @@ ucycom_stop_write(struct usb2_com_softc *ucom) struct ucycom_softc *sc = ucom->sc_parent; usb2_transfer_stop(sc->sc_xfer[0]); - return; } static void @@ -451,7 +446,6 @@ ucycom_cfg_write(struct ucycom_softc *sc, uint32_t baud, uint8_t cfg) DPRINTFN(0, "device request failed, err=%s " "(ignored)\n", usb2_errstr(err)); } - return; } static int @@ -515,7 +509,6 @@ ucycom_cfg_param(struct usb2_com_softc *ucom, struct termios *t) } ucycom_cfg_write(sc, t->c_ospeed, cfg); - return; } static void @@ -529,7 +522,6 @@ ucycom_intr_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UCYCOM_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void diff --git a/sys/dev/usb2/serial/ufoma2.c b/sys/dev/usb2/serial/ufoma2.c index f9b2f2a4591b..52d8a90114da 100644 --- a/sys/dev/usb2/serial/ufoma2.c +++ b/sys/dev/usb2/serial/ufoma2.c @@ -510,7 +510,6 @@ ufoma_cfg_do_request(struct ufoma_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } static void * @@ -551,7 +550,6 @@ ufoma_cfg_link_state(struct ufoma_softc *sc) if (error) { DPRINTF("NO response\n"); } - return; } static void @@ -573,7 +571,6 @@ ufoma_cfg_activate_state(struct ufoma_softc *sc, uint16_t state) if (error) { DPRINTF("No response\n"); } - return; } static void @@ -682,7 +679,6 @@ ufoma_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UFOMA_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -837,7 +833,6 @@ ufoma_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UFOMA_FLAG_BULK_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -880,7 +875,6 @@ ufoma_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UFOMA_FLAG_BULK_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -899,7 +893,6 @@ ufoma_cfg_open(struct usb2_com_softc *ucom) if (sc->sc_currentmode == UMCPC_ACM_MODE_DEACTIVATED) { ufoma_cfg_activate_state(sc, sc->sc_modetoactivate); } - return; } static void @@ -908,7 +901,6 @@ ufoma_cfg_close(struct usb2_com_softc *ucom) struct ufoma_softc *sc = ucom->sc_parent; ufoma_cfg_activate_state(sc, UMCPC_ACM_MODE_DEACTIVATED); - return; } static void @@ -934,7 +926,6 @@ ufoma_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); ufoma_cfg_do_request(sc, &req, 0); - return; } static void @@ -944,7 +935,6 @@ ufoma_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static void @@ -964,7 +954,6 @@ ufoma_cfg_set_line_state(struct ufoma_softc *sc) USETW(req.wLength, 0); ufoma_cfg_do_request(sc, &req, 0); - return; } static void @@ -981,7 +970,6 @@ ufoma_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_line &= ~UCDC_LINE_DTR; ufoma_cfg_set_line_state(sc); - return; } static void @@ -998,7 +986,6 @@ ufoma_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_line &= ~UCDC_LINE_RTS; ufoma_cfg_set_line_state(sc); - return; } static int @@ -1063,7 +1050,6 @@ ufoma_cfg_param(struct usb2_com_softc *ucom, struct termios *t) USETW(req.wLength, UCDC_LINE_STATE_LENGTH); ufoma_cfg_do_request(sc, &req, &ls); - return; } static int @@ -1151,7 +1137,6 @@ ufoma_start_read(struct usb2_com_softc *ucom) } else { usb2_transfer_start(sc->sc_bulk_xfer[1]); } - return; } static void @@ -1170,7 +1155,6 @@ ufoma_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_bulk_xfer[3]); usb2_transfer_stop(sc->sc_bulk_xfer[1]); } - return; } static void @@ -1183,7 +1167,6 @@ ufoma_start_write(struct usb2_com_softc *ucom) } else { usb2_transfer_start(sc->sc_bulk_xfer[0]); } - return; } static void @@ -1197,5 +1180,4 @@ ufoma_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_bulk_xfer[2]); usb2_transfer_stop(sc->sc_bulk_xfer[0]); } - return; } diff --git a/sys/dev/usb2/serial/uftdi2.c b/sys/dev/usb2/serial/uftdi2.c index 43daa43369be..8484afe5094b 100644 --- a/sys/dev/usb2/serial/uftdi2.c +++ b/sys/dev/usb2/serial/uftdi2.c @@ -378,7 +378,6 @@ uftdi_cfg_do_request(struct uftdi_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } static void @@ -413,7 +412,6 @@ uftdi_cfg_open(struct usb2_com_softc *ucom) * "uftdi_cfg_param()" call after "open()", so there is no need for * "open()" to configure anything */ - return; } static void @@ -465,7 +463,6 @@ uftdi_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UFTDI_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -535,7 +532,6 @@ uftdi_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UFTDI_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -554,7 +550,6 @@ uftdi_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wIndex, wIndex); USETW(req.wLength, 0); uftdi_cfg_do_request(sc, &req, NULL); - return; } static void @@ -573,7 +568,6 @@ uftdi_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wIndex, wIndex); USETW(req.wLength, 0); uftdi_cfg_do_request(sc, &req, NULL); - return; } static void @@ -598,7 +592,6 @@ uftdi_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wIndex, wIndex); USETW(req.wLength, 0); uftdi_cfg_do_request(sc, &req, NULL); - return; } static int @@ -745,8 +738,6 @@ uftdi_cfg_param(struct usb2_com_softc *ucom, struct termios *t) USETW2(req.wIndex, cfg.v_flow, wIndex); USETW(req.wLength, 0); uftdi_cfg_do_request(sc, &req, NULL); - - return; } static void @@ -759,7 +750,6 @@ uftdi_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *msr = sc->sc_msr; *lsr = sc->sc_lsr; - return; } static void @@ -768,7 +758,6 @@ uftdi_start_read(struct usb2_com_softc *ucom) struct uftdi_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -778,7 +767,6 @@ uftdi_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -787,7 +775,6 @@ uftdi_start_write(struct usb2_com_softc *ucom) struct uftdi_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -797,7 +784,6 @@ uftdi_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb2/serial/ugensa2.c b/sys/dev/usb2/serial/ugensa2.c index 64479b68134b..8be929b3eb58 100644 --- a/sys/dev/usb2/serial/ugensa2.c +++ b/sys/dev/usb2/serial/ugensa2.c @@ -333,7 +333,6 @@ ugensa_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) ssc->sc_flags &= ~UGENSA_FLAG_BULK_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -376,7 +375,6 @@ ugensa_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) ssc->sc_flags &= ~UGENSA_FLAG_BULK_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -386,7 +384,6 @@ ugensa_start_read(struct usb2_com_softc *ucom) struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno; usb2_transfer_start(ssc->sc_xfer[1]); - return; } static void @@ -397,7 +394,6 @@ ugensa_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(ssc->sc_xfer[3]); usb2_transfer_stop(ssc->sc_xfer[1]); - return; } static void @@ -407,7 +403,6 @@ ugensa_start_write(struct usb2_com_softc *ucom) struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno; usb2_transfer_start(ssc->sc_xfer[0]); - return; } static void @@ -418,5 +413,4 @@ ugensa_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(ssc->sc_xfer[2]); usb2_transfer_stop(ssc->sc_xfer[0]); - return; } diff --git a/sys/dev/usb2/serial/uipaq2.c b/sys/dev/usb2/serial/uipaq2.c index fa96111106ea..064a63940762 100644 --- a/sys/dev/usb2/serial/uipaq2.c +++ b/sys/dev/usb2/serial/uipaq2.c @@ -1192,7 +1192,6 @@ uipaq_start_read(struct usb2_com_softc *ucom) /* start read endpoint */ usb2_transfer_start(sc->sc_xfer_data[1]); - return; } static void @@ -1203,7 +1202,6 @@ uipaq_stop_read(struct usb2_com_softc *ucom) /* stop read endpoint */ usb2_transfer_stop(sc->sc_xfer_data[3]); usb2_transfer_stop(sc->sc_xfer_data[1]); - return; } static void @@ -1212,7 +1210,6 @@ uipaq_start_write(struct usb2_com_softc *ucom) struct uipaq_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer_data[0]); - return; } static void @@ -1222,7 +1219,6 @@ uipaq_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer_data[2]); usb2_transfer_stop(sc->sc_xfer_data[0]); - return; } static void @@ -1249,7 +1245,6 @@ uipaq_cfg_do_request(struct uipaq_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } static void @@ -1273,7 +1268,6 @@ uipaq_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); uipaq_cfg_do_request(sc, &req, NULL); - return; } static void @@ -1297,7 +1291,6 @@ uipaq_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); uipaq_cfg_do_request(sc, &req, NULL); - return; } static void @@ -1317,7 +1310,6 @@ uipaq_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); uipaq_cfg_do_request(sc, &req, NULL); - return; } static void @@ -1362,7 +1354,6 @@ uipaq_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UIPAQ_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1404,5 +1395,4 @@ uipaq_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UIPAQ_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } diff --git a/sys/dev/usb2/serial/ulpt2.c b/sys/dev/usb2/serial/ulpt2.c index 0afd3de72ba6..d95b0fc14071 100644 --- a/sys/dev/usb2/serial/ulpt2.c +++ b/sys/dev/usb2/serial/ulpt2.c @@ -188,7 +188,6 @@ ulpt_reset(struct ulpt_softc *sc) } } mtx_unlock(&sc->sc_mtx); - return; } static void @@ -228,7 +227,6 @@ ulpt_write_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -242,7 +240,6 @@ ulpt_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~ULPT_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -302,7 +299,6 @@ ulpt_read_callback(struct usb2_xfer *xfer) } break; } - return; } static void @@ -316,7 +312,6 @@ ulpt_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~ULPT_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -370,7 +365,6 @@ ulpt_status_callback(struct usb2_xfer *xfer) } break; } - return; } static const struct usb2_config ulpt_config[ULPT_N_TRANSFER] = { @@ -428,7 +422,6 @@ ulpt_start_read(struct usb2_fifo *fifo) struct ulpt_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -438,7 +431,6 @@ ulpt_stop_read(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[4]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -447,7 +439,6 @@ ulpt_start_write(struct usb2_fifo *fifo) struct ulpt_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -457,7 +448,6 @@ ulpt_stop_write(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static int @@ -521,7 +511,6 @@ ulpt_close(struct usb2_fifo *fifo, int fflags, struct thread *td) if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); } - return; } static int @@ -775,7 +764,6 @@ ulpt_watchdog(void *arg) hz, &ulpt_watchdog, sc); mtx_unlock(&sc->sc_mtx); - return; } static devclass_t ulpt_devclass; diff --git a/sys/dev/usb2/serial/umct2.c b/sys/dev/usb2/serial/umct2.c index c3c04efbe451..8e20ee7cd88c 100644 --- a/sys/dev/usb2/serial/umct2.c +++ b/sys/dev/usb2/serial/umct2.c @@ -381,7 +381,6 @@ umct_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UMCT_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -431,7 +430,6 @@ umct_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static void @@ -445,7 +443,6 @@ umct_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_lcr &= ~0x40; umct_cfg_do_request(sc, UMCT_SET_LCR, UMCT_SET_LCR_SIZE, sc->sc_lcr); - return; } static void @@ -459,7 +456,6 @@ umct_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_mcr &= ~0x01; umct_cfg_do_request(sc, UMCT_SET_MCR, UMCT_SET_MCR_SIZE, sc->sc_mcr); - return; } static void @@ -473,7 +469,6 @@ umct_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_mcr &= ~0x02; umct_cfg_do_request(sc, UMCT_SET_MCR, UMCT_SET_MCR_SIZE, sc->sc_mcr); - return; } static uint8_t @@ -551,7 +546,6 @@ umct_cfg_param(struct usb2_com_softc *ucom, struct termios *t) sc->sc_lcr = value; umct_cfg_do_request(sc, UMCT_SET_LCR, UMCT_SET_LCR_SIZE, value); - return; } static void @@ -564,7 +558,6 @@ umct_start_read(struct usb2_com_softc *ucom) /* start read endpoint */ usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -579,7 +572,6 @@ umct_stop_read(struct usb2_com_softc *ucom) /* stop read endpoint */ usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -588,7 +580,6 @@ umct_start_write(struct usb2_com_softc *ucom) struct umct_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -598,7 +589,6 @@ umct_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static void @@ -643,7 +633,6 @@ umct_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UMCT_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -686,5 +675,4 @@ umct_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UMCT_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } diff --git a/sys/dev/usb2/serial/umodem2.c b/sys/dev/usb2/serial/umodem2.c index 097dfb4529d4..3720e235e268 100644 --- a/sys/dev/usb2/serial/umodem2.c +++ b/sys/dev/usb2/serial/umodem2.c @@ -427,7 +427,6 @@ umodem_start_read(struct usb2_com_softc *ucom) } /* start read endpoint */ usb2_transfer_start(sc->sc_xfer_data[1]); - return; } static void @@ -442,7 +441,6 @@ umodem_stop_read(struct usb2_com_softc *ucom) /* stop read endpoint */ usb2_transfer_stop(sc->sc_xfer_data[3]); usb2_transfer_stop(sc->sc_xfer_data[1]); - return; } static void @@ -451,7 +449,6 @@ umodem_start_write(struct usb2_com_softc *ucom) struct umodem_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer_data[0]); - return; } static void @@ -461,7 +458,6 @@ umodem_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer_data[2]); usb2_transfer_stop(sc->sc_xfer_data[0]); - return; } static void @@ -485,8 +481,6 @@ umodem_get_caps(struct usb2_attach_arg *uaa, uint8_t *cm, uint8_t *acm) return; } *acm = cad->bmCapabilities; - - return; } static void @@ -498,7 +492,6 @@ umodem_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static int @@ -554,7 +547,6 @@ umodem_cfg_param(struct usb2_com_softc *ucom, struct termios *t) USETW(req.wLength, sizeof(ls)); umodem_cfg_do_request(sc, &req, &ls); - return; } static int @@ -607,7 +599,6 @@ umodem_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); umodem_cfg_do_request(sc, &req, NULL); - return; } static void @@ -631,7 +622,6 @@ umodem_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); umodem_cfg_do_request(sc, &req, NULL); - return; } static void @@ -656,7 +646,6 @@ umodem_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) umodem_cfg_do_request(sc, &req, NULL); } - return; } static void @@ -760,7 +749,6 @@ umodem_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UMODEM_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -805,7 +793,6 @@ umodem_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UMODEM_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -851,7 +838,6 @@ umodem_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UMODEM_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void * @@ -923,5 +909,4 @@ umodem_cfg_do_request(struct umodem_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } diff --git a/sys/dev/usb2/serial/umoscom2.c b/sys/dev/usb2/serial/umoscom2.c index 2d223dde2b04..d2343f17cdec 100644 --- a/sys/dev/usb2/serial/umoscom2.c +++ b/sys/dev/usb2/serial/umoscom2.c @@ -402,8 +402,6 @@ umoscom_cfg_open(struct usb2_com_softc *ucom) /* Magic */ umoscom_cfg_write(sc, 0x00, 0x02); - - return; } static void @@ -423,7 +421,6 @@ umoscom_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) val |= UMOSCOM_LCR_BREAK; umoscom_cfg_write(sc, UMOSCOM_LCR, val | UMOSCOM_UART_REG); - return; } static void @@ -437,7 +434,6 @@ umoscom_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_mcr &= ~UMOSCOM_MCR_DTR; umoscom_cfg_write(sc, UMOSCOM_MCR, sc->sc_mcr | UMOSCOM_UART_REG); - return; } static void @@ -451,7 +447,6 @@ umoscom_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_mcr &= ~UMOSCOM_MCR_RTS; umoscom_cfg_write(sc, UMOSCOM_MCR, sc->sc_mcr | UMOSCOM_UART_REG); - return; } static int @@ -516,8 +511,6 @@ umoscom_cfg_param(struct usb2_com_softc *ucom, struct termios *t) sc->sc_lcr = data; umoscom_cfg_write(sc, UMOSCOM_LCR, data | UMOSCOM_UART_REG); - - return; } static void @@ -547,8 +540,6 @@ umoscom_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *p_lsr, uint8_t *p_m if (msr & UMOSCOM_MSR_RTS) *p_msr |= SER_DSR; - - return; } static void @@ -607,7 +598,6 @@ umoscom_cfg_do_request(struct umoscom_softc *sc, struct usb2_device_request *req bzero(data, length); } } - return; } static void @@ -621,7 +611,6 @@ umoscom_start_read(struct usb2_com_softc *ucom) #endif /* start read endpoint */ usb2_transfer_start(sc->sc_xfer_data[1]); - return; } static void @@ -636,7 +625,6 @@ umoscom_stop_read(struct usb2_com_softc *ucom) /* stop read endpoint */ usb2_transfer_stop(sc->sc_xfer_data[3]); usb2_transfer_stop(sc->sc_xfer_data[1]); - return; } static void @@ -645,7 +633,6 @@ umoscom_start_write(struct usb2_com_softc *ucom) struct umoscom_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer_data[0]); - return; } static void @@ -655,7 +642,6 @@ umoscom_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer_data[2]); usb2_transfer_stop(sc->sc_xfer_data[0]); - return; } static void @@ -702,7 +688,6 @@ umoscom_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UMOSCOM_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -748,7 +733,6 @@ umoscom_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UMOSCOM_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -795,5 +779,4 @@ umoscom_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~UMOSCOM_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } diff --git a/sys/dev/usb2/serial/uplcom2.c b/sys/dev/usb2/serial/uplcom2.c index 216f0f945e5b..9a51eb5991f7 100644 --- a/sys/dev/usb2/serial/uplcom2.c +++ b/sys/dev/usb2/serial/uplcom2.c @@ -552,7 +552,6 @@ uplcom_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); uplcom_cfg_do_request(sc, &req, NULL); - return; } static void @@ -576,7 +575,6 @@ uplcom_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); uplcom_cfg_do_request(sc, &req, NULL); - return; } static void @@ -598,7 +596,6 @@ uplcom_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) USETW(req.wLength, 0); uplcom_cfg_do_request(sc, &req, NULL); - return; } static const int32_t uplcom_rates[] = { @@ -716,7 +713,6 @@ uplcom_cfg_param(struct usb2_com_softc *ucom, struct termios *t) USETW(req.wLength, 0); uplcom_cfg_do_request(sc, &req, NULL); } - return; } static void @@ -729,7 +725,6 @@ uplcom_start_read(struct usb2_com_softc *ucom) /* start read endpoint */ usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -743,7 +738,6 @@ uplcom_stop_read(struct usb2_com_softc *ucom) /* stop read endpoint */ usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -752,7 +746,6 @@ uplcom_start_write(struct usb2_com_softc *ucom) struct uplcom_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -762,7 +755,6 @@ uplcom_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static void @@ -774,7 +766,6 @@ uplcom_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static int @@ -845,7 +836,6 @@ uplcom_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UPLCOM_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -892,7 +882,6 @@ uplcom_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UPLCOM_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -934,7 +923,6 @@ uplcom_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UPLCOM_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -962,5 +950,4 @@ uplcom_cfg_do_request(struct uplcom_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } diff --git a/sys/dev/usb2/serial/usb2_serial.c b/sys/dev/usb2/serial/usb2_serial.c index 5618892ff617..8872c79470ee 100644 --- a/sys/dev/usb2/serial/usb2_serial.c +++ b/sys/dev/usb2/serial/usb2_serial.c @@ -220,8 +220,6 @@ usb2_com_units_free(uint32_t root_unit, uint32_t sub_units) } mtx_unlock(&Giant); - - return; } /* @@ -302,8 +300,6 @@ usb2_com_detach(struct usb2_com_super_softc *ssc, struct usb2_com_softc *sc, } usb2_config_td_unsetup(&ssc->sc_config_td); - - return; } static int @@ -381,7 +377,6 @@ usb2_com_detach_sub(struct usb2_com_softc *sc) mtx_unlock(sc->sc_parent_mtx); } usb2_cv_destroy(&sc->sc_cv); - return; } static void @@ -393,7 +388,6 @@ usb2_com_config_copy(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, cc->cc_flag1 = (refcount / (2 * UCOM_SUB_UNIT_MAX)) % 2; cc->cc_flag2 = (refcount / (4 * UCOM_SUB_UNIT_MAX)) % 2; cc->cc_flag3 = (refcount / (8 * UCOM_SUB_UNIT_MAX)) % 2; - return; } static void @@ -406,7 +400,6 @@ usb2_com_queue_command(struct usb2_com_softc *sc, usb2_config_td_command_t *cmd, cmd, (cmd == &usb2_com_cfg_status_change) ? 1 : 0, ((sc->sc_local_unit % UCOM_SUB_UNIT_MAX) + (flag ? UCOM_SUB_UNIT_MAX : 0))); - return; } static void @@ -424,7 +417,6 @@ usb2_com_shutdown(struct usb2_com_softc *sc) if (tp->t_termios.c_cflag & HUPCL) { usb2_com_modem(tp, 0, SER_DTR); } - return; } /* @@ -474,7 +466,6 @@ usb2_com_cfg_start_transfers(struct usb2_com_softc *sc, struct usb2_com_config_c if (sc->sc_callback->usb2_com_start_write) { (sc->sc_callback->usb2_com_start_write) (sc); } - return; } static void @@ -496,7 +487,6 @@ usb2_com_start_transfers(struct usb2_com_softc *sc) if (!(sc->sc_flag & UCOM_FLAG_GP_DATA)) { usb2_com_queue_command(sc, &usb2_com_cfg_start_transfers, 0); } - return; } static void @@ -522,7 +512,6 @@ usb2_com_cfg_open(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, usb2_com_cfg_sleep(sc, hz / 10); } } - return; } static int @@ -593,7 +582,6 @@ usb2_com_cfg_close(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, } else { /* already closed */ } - return; } static void @@ -623,7 +611,6 @@ usb2_com_close(struct tty *tp) if (sc->sc_callback->usb2_com_stop_write) { (sc->sc_callback->usb2_com_stop_write) (sc); } - return; } static int @@ -728,7 +715,6 @@ usb2_com_cfg_break(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, if (sc->sc_callback->usb2_com_cfg_set_break) { (sc->sc_callback->usb2_com_cfg_set_break) (sc, cc->cc_flag0); } - return; } static void @@ -742,7 +728,6 @@ usb2_com_break(struct usb2_com_softc *sc, uint8_t onoff) DPRINTF("onoff = %d\n", onoff); usb2_com_queue_command(sc, &usb2_com_cfg_break, onoff); - return; } static void @@ -759,7 +744,6 @@ usb2_com_cfg_dtr(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, if (sc->sc_callback->usb2_com_cfg_set_dtr) { (sc->sc_callback->usb2_com_cfg_set_dtr) (sc, cc->cc_flag0); } - return; } static void @@ -773,7 +757,6 @@ usb2_com_dtr(struct usb2_com_softc *sc, uint8_t onoff) DPRINTF("onoff = %d\n", onoff); usb2_com_queue_command(sc, &usb2_com_cfg_dtr, onoff); - return; } static void @@ -790,7 +773,6 @@ usb2_com_cfg_rts(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, if (sc->sc_callback->usb2_com_cfg_set_rts) { (sc->sc_callback->usb2_com_cfg_set_rts) (sc, cc->cc_flag0); } - return; } static void @@ -804,8 +786,6 @@ usb2_com_rts(struct usb2_com_softc *sc, uint8_t onoff) DPRINTF("onoff = %d\n", onoff); usb2_com_queue_command(sc, &usb2_com_cfg_rts, onoff); - - return; } static void @@ -853,7 +833,6 @@ usb2_com_cfg_status_change(struct usb2_com_softc *sc, ttydisc_modem(tp, onoff); } - return; } void @@ -867,7 +846,6 @@ usb2_com_status_change(struct usb2_com_softc *sc) DPRINTF("\n"); usb2_com_queue_command(sc, &usb2_com_cfg_status_change, 0); - return; } static void @@ -890,8 +868,6 @@ usb2_com_cfg_param(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, /* wait a little */ usb2_com_cfg_sleep(sc, hz / 10); - - return; } static int @@ -982,8 +958,6 @@ usb2_com_start_write(struct tty *tp) sc->sc_flag |= UCOM_FLAG_WR_START; usb2_com_start_transfers(sc); - - return; } /*------------------------------------------------------------------------* @@ -1097,7 +1071,6 @@ usb2_com_put_data(struct usb2_com_softc *sc, struct usb2_page_cache *pc, } } ttydisc_rint_done(tp); - return; } static void diff --git a/sys/dev/usb2/serial/uvisor2.c b/sys/dev/usb2/serial/uvisor2.c index b4907fcd5fde..3fb5d45b4180 100644 --- a/sys/dev/usb2/serial/uvisor2.c +++ b/sys/dev/usb2/serial/uvisor2.c @@ -546,7 +546,6 @@ uvisor_cfg_close(struct usb2_com_softc *ucom) DPRINTFN(0, "close notification failed, error=%s\n", usb2_errstr(err)); } - return; } static void @@ -555,7 +554,6 @@ uvisor_start_read(struct usb2_com_softc *ucom) struct uvisor_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -565,7 +563,6 @@ uvisor_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -574,7 +571,6 @@ uvisor_start_write(struct usb2_com_softc *ucom) struct uvisor_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -584,7 +580,6 @@ uvisor_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static void @@ -629,7 +624,6 @@ uvisor_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UVISOR_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -671,5 +665,4 @@ uvisor_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UVISOR_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } diff --git a/sys/dev/usb2/serial/uvscom2.c b/sys/dev/usb2/serial/uvscom2.c index 57522e72c81e..8f4094f737e6 100644 --- a/sys/dev/usb2/serial/uvscom2.c +++ b/sys/dev/usb2/serial/uvscom2.c @@ -414,7 +414,6 @@ uvscom_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UVSCOM_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -456,7 +455,6 @@ uvscom_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UVSCOM_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -526,7 +524,6 @@ uvscom_intr_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flag &= ~UVSCOM_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -542,7 +539,6 @@ uvscom_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_line &= ~UVSCOM_DTR; uvscom_cfg_write(sc, UVSCOM_LINE_CTL, sc->sc_line); - return; } static void @@ -558,7 +554,6 @@ uvscom_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_line &= ~UVSCOM_RTS; uvscom_cfg_write(sc, UVSCOM_LINE_CTL, sc->sc_line); - return; } static void @@ -574,7 +569,6 @@ uvscom_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) sc->sc_line &= ~UVSCOM_BREAK; uvscom_cfg_write(sc, UVSCOM_LINE_CTL, sc->sc_line); - return; } static int @@ -678,7 +672,6 @@ uvscom_cfg_param(struct usb2_com_softc *ucom, struct termios *t) } uvscom_cfg_write(sc, UVSCOM_SET_PARAM, value); - return; } static int @@ -705,8 +698,6 @@ uvscom_cfg_open(struct usb2_com_softc *ucom) DPRINTF("sc = %p\n", sc); uvscom_cfg_read_status(sc); - - return; } static void @@ -717,8 +708,6 @@ uvscom_cfg_close(struct usb2_com_softc *ucom) DPRINTF("sc=%p\n", sc); uvscom_cfg_write(sc, UVSCOM_SHUTDOWN, 0); - - return; } static void @@ -727,7 +716,6 @@ uvscom_start_read(struct usb2_com_softc *ucom) struct uvscom_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[1]); - return; } static void @@ -737,7 +725,6 @@ uvscom_stop_read(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[3]); usb2_transfer_stop(sc->sc_xfer[1]); - return; } static void @@ -746,7 +733,6 @@ uvscom_start_write(struct usb2_com_softc *ucom) struct uvscom_softc *sc = ucom->sc_parent; usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -756,7 +742,6 @@ uvscom_stop_write(struct usb2_com_softc *ucom) usb2_transfer_stop(sc->sc_xfer[2]); usb2_transfer_stop(sc->sc_xfer[0]); - return; } static void @@ -766,7 +751,6 @@ uvscom_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) *lsr = sc->sc_lsr; *msr = sc->sc_msr; - return; } static int @@ -797,7 +781,6 @@ uvscom_cfg_write(struct uvscom_softc *sc, uint8_t index, uint16_t value) DPRINTFN(0, "device request failed, err=%s " "(ignored)\n", usb2_errstr(err)); } - return; } static uint16_t diff --git a/sys/dev/usb2/sound/uaudio2.c b/sys/dev/usb2/sound/uaudio2.c index 1803717c4015..b843ef13d9f4 100644 --- a/sys/dev/usb2/sound/uaudio2.c +++ b/sys/dev/usb2/sound/uaudio2.c @@ -814,7 +814,6 @@ uaudio_chan_dump_ep_desc(const usb2_endpoint_descriptor_audio_t *ed) UGETW(ed->wMaxPacketSize), ed->bInterval, ed->bRefresh, ed->bSynchAddress); } - return; } #endif @@ -1097,7 +1096,6 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb2_device *udev, continue; } } - return; } static void @@ -1136,7 +1134,6 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb2_device *udev) if (sc->sc_sndstat_valid) { sbuf_finish(&sc->sc_sndstat); } - return; } static void @@ -1224,7 +1221,6 @@ uaudio_chan_play_callback(struct usb2_xfer *xfer) } goto tr_transferred; } - return; } static void @@ -1535,7 +1531,6 @@ uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc, struct uaudio_mixer_node *mc) } else { DPRINTF("out of memory\n"); } - return; } static void @@ -1596,7 +1591,6 @@ uaudio_mixer_add_ctl(struct uaudio_softc *sc, struct uaudio_mixer_node *mc) mc->minval, mc->maxval); } #endif - return; } static void @@ -1613,7 +1607,6 @@ uaudio_mixer_add_input(struct uaudio_softc *sc, d->bNrChannels, UGETW(d->wChannelConfig), d->iChannelNames); #endif - return; } static void @@ -1628,7 +1621,6 @@ uaudio_mixer_add_output(struct uaudio_softc *sc, d->bTerminalId, UGETW(d->wTerminalType), d->bAssocTerminal, d->bSourceId, d->iTerminal); #endif - return; } static void @@ -1714,7 +1706,6 @@ uaudio_mixer_add_mixer(struct uaudio_softc *sc, } p += chs; } - return; } static void @@ -1759,7 +1750,6 @@ uaudio_mixer_add_selector(struct uaudio_softc *sc, mix.class = 0; /* not used */ uaudio_mixer_add_ctl(sc, &mix); - return; } static uint32_t @@ -1908,7 +1898,6 @@ uaudio_mixer_add_feature(struct uaudio_softc *sc, uaudio_mixer_add_ctl(sc, &mix); } } - return; } static void @@ -1951,7 +1940,6 @@ uaudio_mixer_add_processing_updown(struct uaudio_softc *sc, } uaudio_mixer_add_ctl(sc, &mix); - return; } static void @@ -1997,7 +1985,6 @@ uaudio_mixer_add_processing(struct uaudio_softc *sc, d0->bUnitId, ptype); break; } - return; } static void @@ -2030,7 +2017,6 @@ uaudio_mixer_add_extension(struct uaudio_softc *sc, uaudio_mixer_add_ctl(sc, &mix); } - return; } static const void * @@ -2185,7 +2171,6 @@ uaudio_mixer_dump_cluster(uint8_t id, const struct uaudio_terminal_node *iot) } cc >>= 1; } - return; } #endif @@ -2633,7 +2618,6 @@ uaudio_mixer_find_inputs_sub(struct uaudio_terminal_node *root, } } info->recurse_level--; - return; } static void @@ -2659,8 +2643,6 @@ uaudio_mixer_find_outputs_sub(struct uaudio_terminal_node *root, uint8_t id, } } } while (j--); - - return; } static void @@ -2906,7 +2888,6 @@ uaudio_mixer_fill_info(struct uaudio_softc *sc, struct usb2_device *udev, if (iot) { free(iot, M_TEMP); } - return; } static uint16_t @@ -3090,8 +3071,6 @@ uaudio_mixer_ctl_set(struct uaudio_softc *sc, struct uaudio_mixer_node *mc, /* start the transfer, if not already started */ usb2_transfer_start(sc->sc_mixer_xfer[0]); - - return; } static void @@ -3121,7 +3100,6 @@ uaudio_mixer_init(struct uaudio_softc *sc) } } } - return; } int @@ -3173,7 +3151,6 @@ uaudio_mixer_set(struct uaudio_softc *sc, unsigned type, uaudio_mixer_ctl_set(sc, mc, 0, (int)(left * 255) / 100); } } - return; } uint32_t @@ -3235,7 +3212,6 @@ umidi_read_clear_stall_callback(struct usb2_xfer *xfer) chan->flags &= ~UMIDI_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -3315,7 +3291,6 @@ umidi_write_clear_stall_callback(struct usb2_xfer *xfer) chan->flags &= ~UMIDI_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } /* @@ -3578,7 +3553,6 @@ umidi_start_read(struct usb2_fifo *fifo) struct umidi_chan *chan = fifo->priv_sc0; usb2_transfer_start(chan->xfer[1]); - return; } static void @@ -3598,7 +3572,6 @@ umidi_stop_read(struct usb2_fifo *fifo) */ DPRINTF("(stopping read transfer)\n"); } - return; } static void @@ -3607,7 +3580,6 @@ umidi_start_write(struct usb2_fifo *fifo) struct umidi_chan *chan = fifo->priv_sc0; usb2_transfer_start(chan->xfer[0]); - return; } static void @@ -3625,7 +3597,6 @@ umidi_stop_write(struct usb2_fifo *fifo) usb2_transfer_stop(chan->xfer[2]); usb2_transfer_stop(chan->xfer[0]); } - return; } static int @@ -3669,7 +3640,6 @@ umidi_close(struct usb2_fifo *fifo, int fflags, struct thread *td) if (fflags & FWRITE) { usb2_fifo_free_buffer(fifo); } - return; } @@ -3687,7 +3657,6 @@ umidi_init(device_t dev) struct umidi_chan *chan = &sc->sc_midi_chan; mtx_init(&chan->mtx, "umidi lock", NULL, MTX_DEF | MTX_RECURSE); - return; } static struct usb2_fifo_methods umidi_fifo_methods = { diff --git a/sys/dev/usb2/storage/ata-usb2.c b/sys/dev/usb2/storage/ata-usb2.c index 66fd1432147e..98bb4dac9e78 100644 --- a/sys/dev/usb2/storage/ata-usb2.c +++ b/sys/dev/usb2/storage/ata-usb2.c @@ -467,7 +467,6 @@ atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no) } else { atausb2_cancel_request(sc); } - return; } static void @@ -508,7 +507,6 @@ atausb2_t_bbb_reset2_callback(struct usb2_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3, ATAUSB_T_BBB_DATA_READ); - return; } static void @@ -516,7 +514,6 @@ atausb2_t_bbb_reset3_callback(struct usb2_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND, ATAUSB_T_BBB_DATA_WRITE); - return; } static void @@ -650,7 +647,6 @@ atausb2_t_bbb_data_rd_cs_callback(struct usb2_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS, ATAUSB_T_BBB_DATA_READ); - return; } static void @@ -704,7 +700,6 @@ atausb2_t_bbb_data_wr_cs_callback(struct usb2_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS, ATAUSB_T_BBB_DATA_WRITE); - return; } static void @@ -824,7 +819,6 @@ atausb2_cancel_request(struct atausb2_softc *sc) mtx_lock(&sc->locked_mtx); } - return; } static void @@ -841,8 +835,6 @@ atausb2_tr_error(struct usb2_xfer *xfer) } } atausb2_cancel_request(sc); - - return; } /* @@ -1048,7 +1040,6 @@ ata_usbchannel_setmode(device_t parent, device_t dev) atadev->mode = ATA_USB2; else atadev->mode = ATA_USB1; - return; } static int diff --git a/sys/dev/usb2/storage/umass2.c b/sys/dev/usb2/storage/umass2.c index a69038cbc54a..cfdfe7712776 100644 --- a/sys/dev/usb2/storage/umass2.c +++ b/sys/dev/usb2/storage/umass2.c @@ -1641,7 +1641,6 @@ umass_init_shuttle(struct umass_softc *sc) DPRINTF(sc, UDMASS_GEN, "Shuttle init returned 0x%02x%02x\n", status[0], status[1]); - return; } /* @@ -1660,7 +1659,6 @@ umass_transfer_start(struct umass_softc *sc, uint8_t xfer_index) } else { umass_cancel_ccb(sc); } - return; } static void @@ -1673,7 +1671,6 @@ umass_reset(struct umass_softc *sc) */ usb2_transfer_stop(sc->sc_xfer[sc->sc_last_xfer_index]); umass_transfer_start(sc, 0); - return; } static void @@ -1692,7 +1689,6 @@ umass_cancel_ccb(struct umass_softc *sc) (sc, ccb, (sc->sc_transfer.data_len - sc->sc_transfer.actlen), STATUS_WIRE_FAILED); } - return; } static void @@ -1706,7 +1702,6 @@ umass_tr_error(struct usb2_xfer *xfer) "reset\n", usb2_errstr(xfer->error)); } umass_cancel_ccb(sc); - return; } /* @@ -1767,7 +1762,6 @@ umass_t_bbb_reset2_callback(struct usb2_xfer *xfer) { umass_t_bbb_data_clear_stall_callback(xfer, UMASS_T_BBB_RESET3, UMASS_T_BBB_DATA_READ); - return; } static void @@ -1775,7 +1769,6 @@ umass_t_bbb_reset3_callback(struct usb2_xfer *xfer) { umass_t_bbb_data_clear_stall_callback(xfer, UMASS_T_BBB_COMMAND, UMASS_T_BBB_DATA_WRITE); - return; } static void @@ -1942,7 +1935,6 @@ umass_t_bbb_data_rd_cs_callback(struct usb2_xfer *xfer) { umass_t_bbb_data_clear_stall_callback(xfer, UMASS_T_BBB_STATUS, UMASS_T_BBB_DATA_READ); - return; } static void @@ -2001,7 +1993,6 @@ umass_t_bbb_data_wr_cs_callback(struct usb2_xfer *xfer) { umass_t_bbb_data_clear_stall_callback(xfer, UMASS_T_BBB_STATUS, UMASS_T_BBB_DATA_WRITE); - return; } static void @@ -2148,7 +2139,6 @@ umass_command_start(struct umass_softc *sc, uint8_t dir, ccb->ccb_h.status = CAM_TID_INVALID; xpt_done(ccb); } - return; } static uint8_t @@ -2197,7 +2187,6 @@ umass_cbi_start_status(struct umass_softc *sc) (sc, ccb, (sc->sc_transfer.data_len - sc->sc_transfer.actlen), STATUS_CMD_UNKNOWN); } - return; } static void @@ -2271,7 +2260,6 @@ umass_t_cbi_reset2_callback(struct usb2_xfer *xfer) { umass_t_cbi_data_clear_stall_callback(xfer, UMASS_T_CBI_RESET3, UMASS_T_CBI_DATA_READ); - return; } static void @@ -2284,8 +2272,6 @@ umass_t_cbi_reset3_callback(struct usb2_xfer *xfer) sc->sc_xfer[UMASS_T_CBI_STATUS]) ? UMASS_T_CBI_RESET4 : UMASS_T_CBI_COMMAND, UMASS_T_CBI_DATA_WRITE); - - return; } static void @@ -2293,7 +2279,6 @@ umass_t_cbi_reset4_callback(struct usb2_xfer *xfer) { umass_t_cbi_data_clear_stall_callback(xfer, UMASS_T_CBI_COMMAND, UMASS_T_CBI_STATUS); - return; } static void @@ -2442,7 +2427,6 @@ umass_t_cbi_data_rd_cs_callback(struct usb2_xfer *xfer) { umass_t_cbi_data_clear_stall_callback(xfer, UMASS_T_CBI_STATUS, UMASS_T_CBI_DATA_READ); - return; } static void @@ -2502,7 +2486,6 @@ umass_t_cbi_data_wr_cs_callback(struct usb2_xfer *xfer) { umass_t_cbi_data_clear_stall_callback(xfer, UMASS_T_CBI_STATUS, UMASS_T_CBI_DATA_WRITE); - return; } static void @@ -2684,7 +2667,6 @@ umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb) xpt_free_path(ccb->ccb_h.path); free(ccb, M_USBDEV); - return; } static void @@ -2727,8 +2709,6 @@ umass_cam_rescan(struct umass_softc *sc) #endif /* The scan is in progress now. */ - - return; } static void @@ -2754,7 +2734,6 @@ umass_cam_attach(struct umass_softc *sc) /* scan the new sim */ umass_cam_rescan(sc); } - return; } /* umass_cam_detach @@ -2778,7 +2757,6 @@ umass_cam_detach_sim(struct umass_softc *sc) } sc->sc_sim = NULL; } - return; } /* umass_cam_action @@ -3098,7 +3076,6 @@ umass_cam_poll(struct cam_sim *sim) DPRINTF(sc, UDMASS_SCSI, "CAM poll\n"); usb2_do_poll(sc->sc_xfer, UMASS_T_MAX); - return; } @@ -3252,7 +3229,6 @@ umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; xpt_done(ccb); } - return; } /* @@ -3271,7 +3247,6 @@ umass_cam_quirk_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, | CAM_AUTOSNS_VALID; ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; xpt_done(ccb); - return; } /* @@ -3586,7 +3561,6 @@ umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw) c[0], c[1], c[2], c[3], c[4], c[5], (clen > 6 ? "..." : ""), dlen, lun, (flags == CBWFLAGS_IN ? "in" : (flags == CBWFLAGS_OUT ? "out" : ""))); - return; } static void @@ -3604,7 +3578,6 @@ umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw) status, (status == CSWSTATUS_GOOD ? "good" : (status == CSWSTATUS_FAILED ? "failed" : (status == CSWSTATUS_PHASE ? "phase" : "")))); - return; } static void @@ -3622,7 +3595,6 @@ umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, uint8_t cmdlen) (dir == DIR_IN ? "in" : (dir == DIR_OUT ? "out" : (dir == DIR_NONE ? "no data phase" : "")))); - return; } static void @@ -3651,7 +3623,6 @@ umass_dump_buffer(struct umass_softc *sc, uint8_t *buffer, uint32_t buflen, sprintf(s3, " ..."); DPRINTF(sc, UDMASS_GEN, "0x %s%s%s\n", s1, s2, s3); - return; } #endif diff --git a/sys/dev/usb2/storage/urio2.c b/sys/dev/usb2/storage/urio2.c index adf70bc9d570..2007e153fd64 100644 --- a/sys/dev/usb2/storage/urio2.c +++ b/sys/dev/usb2/storage/urio2.c @@ -293,7 +293,6 @@ urio_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~URIO_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -339,7 +338,6 @@ urio_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~URIO_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -348,7 +346,6 @@ urio_start_read(struct usb2_fifo *fifo) struct urio_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[URIO_T_RD]); - return; } static void @@ -358,7 +355,6 @@ urio_stop_read(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[URIO_T_RD_CS]); usb2_transfer_stop(sc->sc_xfer[URIO_T_RD]); - return; } static void @@ -367,7 +363,6 @@ urio_start_write(struct usb2_fifo *fifo) struct urio_softc *sc = fifo->priv_sc0; usb2_transfer_start(sc->sc_xfer[URIO_T_WR]); - return; } static void @@ -377,7 +372,6 @@ urio_stop_write(struct usb2_fifo *fifo) usb2_transfer_stop(sc->sc_xfer[URIO_T_WR_CS]); usb2_transfer_stop(sc->sc_xfer[URIO_T_WR]); - return; } static int @@ -419,7 +413,6 @@ urio_close(struct usb2_fifo *fifo, int fflags, struct thread *td) if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); } - return; } static int diff --git a/sys/dev/usb2/storage/ustorage2_fs.c b/sys/dev/usb2/storage/ustorage2_fs.c index b7977de228bb..62981d7f19df 100644 --- a/sys/dev/usb2/storage/ustorage2_fs.c +++ b/sys/dev/usb2/storage/ustorage2_fs.c @@ -431,7 +431,6 @@ ustorage_fs_transfer_start(struct ustorage_fs_softc *sc, uint8_t xfer_index) sc->sc_last_xfer_index = xfer_index; usb2_transfer_start(sc->sc_xfer[xfer_index]); } - return; } static void @@ -441,7 +440,6 @@ ustorage_fs_transfer_stop(struct ustorage_fs_softc *sc) mtx_unlock(&sc->sc_mtx); usb2_transfer_drain(sc->sc_xfer[sc->sc_last_xfer_index]); mtx_lock(&sc->sc_mtx); - return; } static int @@ -608,7 +606,6 @@ ustorage_fs_t_bbb_command_callback(struct usb2_xfer *xfer) } ustorage_fs_transfer_start(sc, USTORAGE_FS_T_BBB_STATUS); } - return; } static void @@ -661,7 +658,6 @@ ustorage_fs_t_bbb_data_dump_callback(struct usb2_xfer *xfer) /* try again */ goto tr_setup; } - return; } static void @@ -715,7 +711,6 @@ ustorage_fs_t_bbb_data_read_callback(struct usb2_xfer *xfer) /* try again */ goto tr_setup; } - return; } static void @@ -778,7 +773,6 @@ ustorage_fs_t_bbb_data_write_callback(struct usb2_xfer *xfer) /* try again */ goto tr_setup; } - return; } static void @@ -821,7 +815,6 @@ ustorage_fs_t_bbb_status_callback(struct usb2_xfer *xfer) /* try again */ goto tr_setup; } - return; } /* SCSI commands that we recognize */ diff --git a/sys/dev/usb2/template/usb2_template.c b/sys/dev/usb2/template/usb2_template.c index 6c803b617ef7..3bd0d64546e3 100644 --- a/sys/dev/usb2/template/usb2_template.c +++ b/sys/dev/usb2/template/usb2_template.c @@ -130,7 +130,6 @@ usb2_make_raw_desc(struct usb2_temp_setup *temp, } temp->size += len; } - return; } /*------------------------------------------------------------------------* @@ -231,7 +230,6 @@ usb2_make_endpoint_desc(struct usb2_temp_setup *temp, } } temp->bNumEndpoints++; - return; } /*------------------------------------------------------------------------* @@ -303,7 +301,6 @@ usb2_make_interface_desc(struct usb2_temp_setup *temp, id->bInterfaceProtocol = tid->bInterfaceProtocol; id->iInterface = tid->iInterface; } - return; } /*------------------------------------------------------------------------* @@ -366,7 +363,6 @@ usb2_make_config_desc(struct usb2_temp_setup *temp, cd->bmAttributes &= ~UC_SELF_POWERED; } } - return; } /*------------------------------------------------------------------------* @@ -462,7 +458,6 @@ usb2_make_device_desc(struct usb2_temp_setup *temp, break; } } - return; } /*------------------------------------------------------------------------* @@ -1168,7 +1163,6 @@ usb2_temp_get_desc(struct usb2_device *udev, struct usb2_device_request *req, tr_stalled: *pPtr = NULL; *pLength = 0; - return; } /*------------------------------------------------------------------------* @@ -1281,7 +1275,6 @@ usb2_temp_unsetup(struct usb2_device *udev) udev->usb2_template_ptr = NULL; } - return; } static usb2_error_t @@ -1313,7 +1306,6 @@ usb2_temp_init(void *arg) usb2_temp_get_desc_p = &usb2_temp_get_desc; usb2_temp_setup_by_index_p = &usb2_temp_setup_by_index; usb2_temp_unsetup_p = &usb2_temp_unsetup; - return; } SYSINIT(usb2_temp_init, SI_SUB_LOCK, SI_ORDER_FIRST, usb2_temp_init, NULL); diff --git a/sys/dev/usb2/wlan/if_rum2.c b/sys/dev/usb2/wlan/if_rum2.c index 3864599db625..a001d8d82de4 100644 --- a/sys/dev/usb2/wlan/if_rum2.c +++ b/sys/dev/usb2/wlan/if_rum2.c @@ -587,7 +587,6 @@ rum_cfg_do_request(struct rum_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } static void @@ -602,7 +601,6 @@ rum_cfg_eeprom_read(struct rum_softc *sc, uint16_t addr, void *buf, uint16_t len USETW(req.wLength, len); rum_cfg_do_request(sc, &req, buf); - return; } static uint16_t @@ -635,7 +633,6 @@ rum_cfg_read_multi(struct rum_softc *sc, uint16_t reg, void *buf, uint16_t len) USETW(req.wLength, len); rum_cfg_do_request(sc, &req, buf); - return; } static void @@ -644,7 +641,6 @@ rum_cfg_write(struct rum_softc *sc, uint16_t reg, uint32_t val) uint32_t tmp = htole32(val); rum_cfg_write_multi(sc, reg, &tmp, sizeof(tmp)); - return; } static void @@ -659,7 +655,6 @@ rum_cfg_write_multi(struct rum_softc *sc, uint16_t reg, void *buf, uint16_t len) USETW(req.wLength, len); rum_cfg_do_request(sc, &req, buf); - return; } static uint32_t @@ -696,7 +691,6 @@ rum_cfg_bbp_write(struct rum_softc *sc, uint8_t reg, uint8_t val) } tmp = RT2573_BBP_BUSY | ((reg & 0x7f) << 8) | val; rum_cfg_write(sc, RT2573_PHY_CSR3, tmp); - return; } static uint8_t @@ -741,7 +735,6 @@ rum_cfg_rf_write(struct rum_softc *sc, uint8_t reg, uint32_t val) rum_cfg_write(sc, RT2573_PHY_CSR4, tmp); DPRINTFN(16, "RF R[%u] <- 0x%05x\n", reg, val & 0xfffff); - return; } static void @@ -908,7 +901,6 @@ rum_end_of_commands(struct rum_softc *sc) /* start write transfer, if not started */ usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -933,7 +925,6 @@ rum_config_copy_chan(struct rum_config_copy_chan *cc, if (IEEE80211_IS_CHAN_ANYG(c)) cc->chan_is_g = 1; } - return; } static void @@ -981,7 +972,6 @@ rum_config_copy(struct rum_softc *sc, } } sc->sc_flags |= RUM_FLAG_WAIT_COMMAND; - return; } static const char * @@ -1141,7 +1131,6 @@ rum_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~RUM_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static uint8_t @@ -1317,7 +1306,6 @@ rum_setup_desc_and_tx(struct rum_softc *sc, struct mbuf *m, uint32_t flags, _IF_ENQUEUE(&sc->sc_tx_queue, mm); usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -1400,7 +1388,6 @@ rum_bulk_write_callback(struct usb2_xfer *xfer) ifp->if_oerrors++; break; } - return; } static void @@ -1414,7 +1401,6 @@ rum_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~RUM_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1433,8 +1419,6 @@ rum_watchdog(void *arg) hz, &rum_watchdog, sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1447,8 +1431,6 @@ rum_init_cb(void *arg) (&sc->sc_config_td, &rum_cfg_pre_init, &rum_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static int @@ -1498,8 +1480,6 @@ rum_start_cb(struct ifnet *ifp) /* start write transfer, if not started */ usb2_transfer_start(sc->sc_xfer[0]); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1541,7 +1521,6 @@ rum_cfg_newstate(struct rum_softc *sc, vap->iv_newstate_cb(vap, nstate, arg); IEEE80211_UNLOCK(ic); mtx_lock(&sc->sc_mtx); - return; } static int @@ -1599,29 +1578,24 @@ rum_std_command(struct ieee80211com *ic, usb2_config_td_command_t *func) (&sc->sc_config_td, &rum_config_copy, func, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void rum_scan_start_cb(struct ieee80211com *ic) { rum_std_command(ic, &rum_cfg_scan_start); - return; } static void rum_scan_end_cb(struct ieee80211com *ic) { rum_std_command(ic, &rum_cfg_scan_end); - return; } static void rum_set_channel_cb(struct ieee80211com *ic) { rum_std_command(ic, &rum_cfg_set_chan); - return; } static void @@ -1631,7 +1605,6 @@ rum_cfg_scan_start(struct rum_softc *sc, /* abort TSF synchronization */ rum_cfg_disable_tsf_sync(sc); rum_cfg_set_bssid(sc, cc->if_broadcastaddr); - return; } static void @@ -1641,7 +1614,6 @@ rum_cfg_scan_end(struct rum_softc *sc, /* enable TSF synchronization */ rum_cfg_enable_tsf_sync(sc, cc, 0); rum_cfg_set_bssid(sc, cc->iv_bss.ni_bssid); - return; } /* @@ -1702,8 +1674,6 @@ rum_cfg_select_band(struct rum_softc *sc, /* 802.11a uses a 16 microseconds short interframe space */ sc->sc_sifs = cc->ic_curchan.chan_is_5ghz ? 16 : 10; - - return; } static void @@ -1807,7 +1777,6 @@ rum_cfg_set_chan(struct rum_softc *sc, if (usb2_config_td_sleep(&sc->sc_config_td, hz / 100)) { return; } - return; } static void @@ -1845,7 +1814,6 @@ rum_cfg_set_run(struct rum_softc *sc, /* enable automatic rate adaptation */ rum_cfg_amrr_start(sc); } - return; } static void @@ -1873,8 +1841,6 @@ rum_cfg_enable_tsf_sync(struct rum_softc *sc, tmp |= RT2573_TSF_MODE(2) | RT2573_GENERATE_BEACON; rum_cfg_write(sc, RT2573_TXRX_CSR9, tmp); - - return; } static void @@ -1885,7 +1851,6 @@ rum_cfg_disable_tsf_sync(struct rum_softc *sc) /* abort TSF synchronization */ tmp = rum_cfg_read(sc, RT2573_TXRX_CSR9); rum_cfg_write(sc, RT2573_TXRX_CSR9, tmp & ~0x00ffffff); - return; } /* @@ -1908,8 +1873,6 @@ rum_cfg_enable_mrr(struct rum_softc *sc, tmp |= RT2573_MRR_ENABLED; rum_cfg_write(sc, RT2573_TXRX_CSR4, tmp); - - return; } static void @@ -1926,8 +1889,6 @@ rum_cfg_update_slot(struct rum_softc *sc, rum_cfg_write(sc, RT2573_MAC_CSR9, tmp); DPRINTF("setting slot time to %u us\n", slottime); - - return; } static void @@ -1944,8 +1905,6 @@ rum_cfg_set_txpreamble(struct rum_softc *sc, tmp &= ~RT2573_SHORT_PREAMBLE; rum_cfg_write(sc, RT2573_TXRX_CSR4, tmp); - - return; } static void @@ -1958,8 +1917,6 @@ rum_cfg_set_bssid(struct rum_softc *sc, uint8_t *bssid) tmp = (bssid[4]) | (bssid[5] << 8) | (RT2573_ONE_BSSID << 16); rum_cfg_write(sc, RT2573_MAC_CSR5, tmp); - - return; } static void @@ -1972,8 +1929,6 @@ rum_cfg_set_macaddr(struct rum_softc *sc, uint8_t *addr) tmp = addr[4] | (addr[5] << 8) | (0xff << 16); rum_cfg_write(sc, RT2573_MAC_CSR3, tmp); - - return; } static void @@ -1994,7 +1949,6 @@ rum_cfg_update_promisc(struct rum_softc *sc, DPRINTF("%s promiscuous mode\n", (cc->if_flags & IFF_PROMISC) ? "entering" : "leaving"); - return; } static void @@ -2072,8 +2026,6 @@ rum_cfg_select_antenna(struct rum_softc *sc, rum_cfg_bbp_write(sc, 77, bbp77); rum_cfg_write(sc, RT2573_TXRX_CSR0, tmp); - - return; } static void @@ -2148,8 +2100,6 @@ rum_cfg_read_eeprom(struct rum_softc *sc) /* read default values for BBP registers */ rum_cfg_eeprom_read(sc, RT2573_EEPROM_BBP_BASE, sc->sc_bbp_prom, 2 * 16); - - return; } static uint8_t @@ -2211,7 +2161,6 @@ rum_cfg_pre_init(struct rum_softc *sc, sc->sc_flags |= RUM_FLAG_HL_READY; IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); - return; } static void @@ -2325,7 +2274,6 @@ rum_cfg_init(struct rum_softc *sc, if (cc) { rum_cfg_stop(sc, cc, 0); } - return; } static void @@ -2357,7 +2305,6 @@ rum_cfg_pre_stop(struct rum_softc *sc, /* clean up transmission */ rum_tx_clean_queue(sc); - return; } static void @@ -2380,8 +2327,6 @@ rum_cfg_stop(struct rum_softc *sc, /* wait a little */ usb2_config_td_sleep(&sc->sc_config_td, hz / 10); - - return; } static void @@ -2406,7 +2351,6 @@ rum_cfg_amrr_start(struct rum_softc *sc) /* enable AMRR timer */ sc->sc_amrr_timer = 1; - return; } static void @@ -2447,7 +2391,6 @@ rum_cfg_amrr_timeout(struct rum_softc *sc, } ifp->if_oerrors += fail;/* count TX retry-fail as Tx errors */ } - return; } static void @@ -2474,8 +2417,6 @@ rum_cfg_load_microcode(struct rum_softc *sc, const uint8_t *ucode, uint16_t size USETW(req.wLength, 0); rum_cfg_do_request(sc, &req, NULL); - - return; } static void @@ -2511,7 +2452,6 @@ rum_cfg_prepare_beacon(struct rum_softc *sc, m->m_pkthdr.rcvif = (void *)ieee80211_ref_node(ni); rum_setup_desc_and_tx(sc, m, RT2573_TX_TIMESTAMP, RT2573_TX_HWSEQ | RT2573_TX_BEACON, tp->mgmtrate); - return; } static uint8_t @@ -2640,7 +2580,6 @@ rum_vap_delete(struct ieee80211vap *vap) ieee80211_amrr_cleanup(&rvp->amrr); ieee80211_vap_detach(vap); free(rvp, M_80211_VAP); - return; } /* ARGUSED */ @@ -2660,7 +2599,6 @@ rum_newassoc(struct ieee80211_node *ni, int isnew) struct ieee80211vap *vap = ni->ni_vap; ieee80211_amrr_node_init(&RUM_VAP(vap)->amrr, &RUM_NODE(ni)->amn, ni); - return; } static void @@ -2689,7 +2627,6 @@ rum_fill_write_queue(struct rum_softc *sc) } rum_tx_data(sc, m, ni); } - return; } static void @@ -2705,7 +2642,6 @@ rum_tx_clean_queue(struct rum_softc *sc) } rum_tx_freem(m); } - return; } static void @@ -2727,7 +2663,6 @@ rum_tx_freem(struct mbuf *m) break; } - return; } static void @@ -2769,7 +2704,6 @@ rum_tx_mgt(struct rum_softc *sc, struct mbuf *m, struct ieee80211_node *ni) } m->m_pkthdr.rcvif = (void *)ni; rum_setup_desc_and_tx(sc, m, flags, 0, tp->mgmtrate); - return; } static struct ieee80211vap * @@ -2848,7 +2782,6 @@ rum_tx_data(struct rum_softc *sc, struct mbuf *m, } m->m_pkthdr.rcvif = (void *)ni; rum_setup_desc_and_tx(sc, m, flags, 0, rate); - return; } static void @@ -2895,7 +2828,6 @@ rum_tx_prot(struct rum_softc *sc, } mprot->m_pkthdr.rcvif = (void *)ieee80211_ref_node(ni); rum_setup_desc_and_tx(sc, mprot, flags, 0, protrate); - return; } static void @@ -2927,7 +2859,6 @@ rum_tx_raw(struct rum_softc *sc, struct mbuf *m, struct ieee80211_node *ni, } m->m_pkthdr.rcvif = (void *)ni; rum_setup_desc_and_tx(sc, m, flags, 0, rate); - return; } static int @@ -2960,7 +2891,6 @@ static void rum_update_mcast_cb(struct ifnet *ifp) { /* not supported */ - return; } static void @@ -2973,5 +2903,4 @@ rum_update_promisc_cb(struct ifnet *ifp) (&sc->sc_config_td, &rum_config_copy, &rum_cfg_update_promisc, 0, 0); mtx_unlock(&sc->sc_mtx); - return; } diff --git a/sys/dev/usb2/wlan/if_ural2.c b/sys/dev/usb2/wlan/if_ural2.c index 41c283f478b7..0af78c7e3567 100644 --- a/sys/dev/usb2/wlan/if_ural2.c +++ b/sys/dev/usb2/wlan/if_ural2.c @@ -586,7 +586,6 @@ ural_cfg_do_request(struct ural_softc *sc, struct usb2_device_request *req, bzero(data, length); } } - return; } static void @@ -601,7 +600,6 @@ ural_cfg_set_testmode(struct ural_softc *sc) USETW(req.wLength, 0); ural_cfg_do_request(sc, &req, NULL); - return; } static void @@ -617,7 +615,6 @@ ural_cfg_eeprom_read(struct ural_softc *sc, uint16_t addr, USETW(req.wLength, len); ural_cfg_do_request(sc, &req, buf); - return; } static uint16_t @@ -650,7 +647,6 @@ ural_cfg_read_multi(struct ural_softc *sc, uint16_t reg, USETW(req.wLength, len); ural_cfg_do_request(sc, &req, buf); - return; } static void @@ -665,7 +661,6 @@ ural_cfg_write(struct ural_softc *sc, uint16_t reg, uint16_t val) USETW(req.wLength, 0); ural_cfg_do_request(sc, &req, NULL); - return; } static void @@ -681,7 +676,6 @@ ural_cfg_write_multi(struct ural_softc *sc, uint16_t reg, USETW(req.wLength, len); ural_cfg_do_request(sc, &req, buf); - return; } static uint8_t @@ -719,7 +713,6 @@ ural_cfg_bbp_write(struct ural_softc *sc, uint8_t reg, uint8_t val) } tmp = (reg << 8) | val; ural_cfg_write(sc, RAL_PHY_CSR7, tmp); - return; } static uint8_t @@ -771,7 +764,6 @@ ural_cfg_rf_write(struct ural_softc *sc, uint8_t reg, uint32_t val) ural_cfg_write(sc, RAL_PHY_CSR10, tmp >> 16); DPRINTFN(16, "RF R[%u] <- 0x%05x\n", reg, val & 0xfffff); - return; } static void @@ -893,7 +885,6 @@ ural_end_of_commands(struct ural_softc *sc) /* start write transfer, if not started */ usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -918,7 +909,6 @@ ural_config_copy_chan(struct ural_config_copy_chan *cc, if (IEEE80211_IS_CHAN_ANYG(c)) cc->chan_is_g = 1; } - return; } static void @@ -966,7 +956,6 @@ ural_config_copy(struct ural_softc *sc, } } sc->sc_flags |= URAL_FLAG_WAIT_COMMAND; - return; } static const char * @@ -1144,7 +1133,6 @@ ural_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~URAL_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static uint8_t @@ -1306,7 +1294,6 @@ ural_setup_desc_and_tx(struct ural_softc *sc, struct mbuf *m, _IF_ENQUEUE(&sc->sc_tx_queue, mm); usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -1389,7 +1376,6 @@ ural_bulk_write_callback(struct usb2_xfer *xfer) ifp->if_oerrors++; break; } - return; } static void @@ -1403,7 +1389,6 @@ ural_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~URAL_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1422,8 +1407,6 @@ ural_watchdog(void *arg) hz, &ural_watchdog, sc); mtx_unlock(&sc->sc_mtx); - - return; } /*========================================================================* @@ -1440,8 +1423,6 @@ ural_init_cb(void *arg) (&sc->sc_config_td, &ural_cfg_pre_init, &ural_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static int @@ -1491,8 +1472,6 @@ ural_start_cb(struct ifnet *ifp) /* start write transfer, if not started */ usb2_transfer_start(sc->sc_xfer[0]); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -1534,7 +1513,6 @@ ural_cfg_newstate(struct ural_softc *sc, vap->iv_newstate_cb(vap, nstate, arg); IEEE80211_UNLOCK(ic); mtx_lock(&sc->sc_mtx); - return; } static int @@ -1593,29 +1571,24 @@ ural_std_command(struct ieee80211com *ic, usb2_config_td_command_t *func) (&sc->sc_config_td, &ural_config_copy, func, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void ural_scan_start_cb(struct ieee80211com *ic) { ural_std_command(ic, &ural_cfg_scan_start); - return; } static void ural_scan_end_cb(struct ieee80211com *ic) { ural_std_command(ic, &ural_cfg_scan_end); - return; } static void ural_set_channel_cb(struct ieee80211com *ic) { ural_std_command(ic, &ural_cfg_set_chan); - return; } /*========================================================================* @@ -1629,7 +1602,6 @@ ural_cfg_scan_start(struct ural_softc *sc, /* abort TSF synchronization */ ural_cfg_disable_tsf_sync(sc); ural_cfg_set_bssid(sc, cc->if_broadcastaddr); - return; } static void @@ -1639,7 +1611,6 @@ ural_cfg_scan_end(struct ural_softc *sc, /* enable TSF synchronization */ ural_cfg_enable_tsf_sync(sc, cc, 0); ural_cfg_set_bssid(sc, cc->iv_bss.ni_bssid); - return; } static void @@ -1771,7 +1742,6 @@ ural_cfg_set_chan(struct ural_softc *sc, if (usb2_config_td_sleep(&sc->sc_config_td, hz / 100)) { return; } - return; } static void @@ -1813,7 +1783,6 @@ ural_cfg_set_run(struct ural_softc *sc, /* enable automatic rate adaptation */ ural_cfg_amrr_start(sc); } - return; } /*------------------------------------------------------------------------* @@ -1832,8 +1801,6 @@ ural_cfg_disable_rf_tune(struct ural_softc *sc) ural_cfg_rf_write(sc, RAL_RF3, tmp); DPRINTFN(3, "disabling RF autotune\n"); - - return; } /*------------------------------------------------------------------------* @@ -1869,8 +1836,6 @@ ural_cfg_enable_tsf_sync(struct ural_softc *sc, ural_cfg_write(sc, RAL_TXRX_CSR19, tmp); DPRINTF("enabling TSF synchronization\n"); - - return; } static void @@ -1881,8 +1846,6 @@ ural_cfg_disable_tsf_sync(struct ural_softc *sc) /* force tx led to stop blinking */ ural_cfg_write(sc, RAL_MAC_CSR20, 0); - - return; } #define RAL_RXTX_TURNAROUND 5 /* us */ @@ -1912,7 +1875,6 @@ ural_cfg_update_slot(struct ural_softc *sc, ural_cfg_write(sc, RAL_MAC_CSR10, slottime); ural_cfg_write(sc, RAL_MAC_CSR11, sifs); ural_cfg_write(sc, RAL_MAC_CSR12, eifs); - return; } static void @@ -1930,7 +1892,6 @@ ural_cfg_set_txpreamble(struct ural_softc *sc, } ural_cfg_write(sc, RAL_TXRX_CSR10, tmp); - return; } static void @@ -1941,7 +1902,6 @@ ural_cfg_set_bssid(struct ural_softc *sc, uint8_t *bssid) DPRINTF("setting BSSID to 0x%02x%02x%02x%02x%02x%02x\n", bssid[5], bssid[4], bssid[3], bssid[2], bssid[1], bssid[0]); - return; } static void @@ -1952,7 +1912,6 @@ ural_cfg_set_macaddr(struct ural_softc *sc, uint8_t *addr) DPRINTF("setting MAC to 0x%02x%02x%02x%02x%02x%02x\n", addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]); - return; } static void @@ -1974,7 +1933,6 @@ ural_cfg_update_promisc(struct ural_softc *sc, DPRINTF("%s promiscuous mode\n", (cc->if_flags & IFF_PROMISC) ? "entering" : "leaving"); - return; } static void @@ -2005,8 +1963,6 @@ ural_cfg_set_txantenna(struct ural_softc *sc, uint8_t antenna) tmp = ural_cfg_read(sc, RAL_PHY_CSR6) & ~0x7; ural_cfg_write(sc, RAL_PHY_CSR6, tmp | (tx & 0x7)); - - return; } static void @@ -2029,7 +1985,6 @@ ural_cfg_set_rxantenna(struct ural_softc *sc, uint8_t antenna) rx &= ~RAL_BBP_FLIPIQ; } ural_cfg_bbp_write(sc, RAL_BBP_RX, rx); - return; } static void @@ -2061,7 +2016,6 @@ ural_cfg_read_eeprom(struct ural_softc *sc) /* read Tx power for all b/g channels */ ural_cfg_eeprom_read(sc, RAL_EEPROM_TXPOWER, sc->sc_txpow, sizeof(sc->sc_txpow)); - return; } static uint8_t @@ -2123,8 +2077,6 @@ ural_cfg_pre_init(struct ural_softc *sc, sc->sc_flags |= URAL_FLAG_HL_READY; IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); - - return; } static void @@ -2245,7 +2197,6 @@ ural_cfg_init(struct ural_softc *sc, if (cc) { ural_cfg_stop(sc, cc, 0); } - return; } static void @@ -2277,7 +2228,6 @@ ural_cfg_pre_stop(struct ural_softc *sc, /* clean up transmission */ ural_tx_clean_queue(sc); - return; } static void @@ -2298,8 +2248,6 @@ ural_cfg_stop(struct ural_softc *sc, /* wait a little */ usb2_config_td_sleep(&sc->sc_config_td, hz / 10); - - return; } static void @@ -2323,7 +2271,6 @@ ural_cfg_amrr_start(struct ural_softc *sc) /* enable AMRR timer */ sc->sc_amrr_timer = 1; - return; } static void @@ -2365,7 +2312,6 @@ ural_cfg_amrr_timeout(struct ural_softc *sc, } ifp->if_oerrors += fail; } - return; } static struct ieee80211vap * @@ -2432,7 +2378,6 @@ ural_vap_delete(struct ieee80211vap *vap) ieee80211_amrr_cleanup(&uvp->amrr); ieee80211_vap_detach(vap); free(uvp, M_80211_VAP); - return; } /* ARGUSED */ @@ -2452,7 +2397,6 @@ ural_newassoc(struct ieee80211_node *ni, int isnew) struct ieee80211vap *vap = ni->ni_vap; ieee80211_amrr_node_init(&URAL_VAP(vap)->amrr, &URAL_NODE(ni)->amn, ni); - return; } static void @@ -2481,7 +2425,6 @@ ural_fill_write_queue(struct ural_softc *sc) } ural_tx_data(sc, m, ni); } - return; } static void @@ -2497,8 +2440,6 @@ ural_tx_clean_queue(struct ural_softc *sc) } ural_tx_freem(m); } - - return; } static void @@ -2520,7 +2461,6 @@ ural_tx_freem(struct mbuf *m) break; } - return; } static void @@ -2563,7 +2503,6 @@ ural_tx_mgt(struct ural_softc *sc, struct mbuf *m, struct ieee80211_node *ni) } m->m_pkthdr.rcvif = (void *)ni; ural_setup_desc_and_tx(sc, m, flags, tp->mgmtrate); - return; } static struct ieee80211vap * @@ -2619,7 +2558,6 @@ ural_tx_bcn(struct ural_softc *sc) m->m_pkthdr.rcvif = (void *)ieee80211_ref_node(ni); ural_setup_desc_and_tx(sc, m, RAL_TX_IFS_NEWBACKOFF | RAL_TX_TIMESTAMP, tp->mgmtrate); - return; } static void @@ -2677,7 +2615,6 @@ ural_tx_data(struct ural_softc *sc, struct mbuf *m, struct ieee80211_node *ni) } m->m_pkthdr.rcvif = (void *)ni; ural_setup_desc_and_tx(sc, m, flags, rate); - return; } static void @@ -2724,7 +2661,6 @@ ural_tx_prot(struct ural_softc *sc, } mprot->m_pkthdr.rcvif = (void *)ieee80211_ref_node(ni); ural_setup_desc_and_tx(sc, mprot, flags, protrate); - return; } static void @@ -2756,7 +2692,6 @@ ural_tx_raw(struct ural_softc *sc, struct mbuf *m, struct ieee80211_node *ni, } m->m_pkthdr.rcvif = (void *)ni; ural_setup_desc_and_tx(sc, m, flags, rate); - return; } static int @@ -2789,7 +2724,6 @@ static void ural_update_mcast_cb(struct ifnet *ifp) { /* not supported */ - return; } static void @@ -2802,5 +2736,4 @@ ural_update_promisc_cb(struct ifnet *ifp) (&sc->sc_config_td, &ural_config_copy, &ural_cfg_update_promisc, 0, 0); mtx_unlock(&sc->sc_mtx); - return; } diff --git a/sys/dev/usb2/wlan/if_zyd2.c b/sys/dev/usb2/wlan/if_zyd2.c index 025239f2ffbf..d71516012a08 100644 --- a/sys/dev/usb2/wlan/if_zyd2.c +++ b/sys/dev/usb2/wlan/if_zyd2.c @@ -366,7 +366,6 @@ zyd_cfg_usbrequest(struct zyd_softc *sc, struct usb2_device_request *req, uint8_ bzero(data, length); } } - return; } static void @@ -380,7 +379,6 @@ zyd_intr_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~ZYD_FLAG_INTR_READ_STALL; usb2_transfer_start(xfer_other); } - return; } /* @@ -499,7 +497,6 @@ handle_notif_retrystatus:{ * We pause reading data from the interrupt endpoint until the * data has been picked up! */ - return; } /* @@ -589,7 +586,6 @@ zyd_intr_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~ZYD_FLAG_INTR_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -635,7 +631,6 @@ zyd_intr_write_callback(struct usb2_xfer *xfer) sc->sc_intr_owakeup = 0; usb2_cv_signal(&sc->sc_intr_cv); } - return; } /* @@ -686,7 +681,6 @@ zyd_cfg_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, uint16_t ile if (flags & ZYD_CMD_FLAG_READ) { zyd_cfg_usb2_intr_read(sc, odata, olen); } - return; } static void @@ -698,7 +692,6 @@ zyd_cfg_read16(struct zyd_softc *sc, uint16_t addr, uint16_t *value) zyd_cfg_cmd(sc, ZYD_CMD_IORD, &addr, sizeof(addr), tmp, sizeof(tmp), ZYD_CMD_FLAG_READ); *value = le16toh(tmp[0].val); - return; } static void @@ -715,7 +708,6 @@ zyd_cfg_read32(struct zyd_softc *sc, uint16_t addr, uint32_t *value) zyd_cfg_cmd(sc, ZYD_CMD_IORD, regs, sizeof(regs), tmp, sizeof(tmp), ZYD_CMD_FLAG_READ); *value = (le16toh(tmp[0].val) << 16) | le16toh(tmp[1].val); - return; } static void @@ -727,7 +719,6 @@ zyd_cfg_write16(struct zyd_softc *sc, uint16_t reg, uint16_t val) pair[0].val = htole16(val); zyd_cfg_cmd(sc, ZYD_CMD_IOWR, pair, sizeof(pair), NULL, 0, 0); - return; } static void @@ -741,7 +732,6 @@ zyd_cfg_write32(struct zyd_softc *sc, uint16_t reg, uint32_t val) pair[1].val = htole16(val & 0xffff); zyd_cfg_cmd(sc, ZYD_CMD_IOWR, pair, sizeof(pair), NULL, 0, 0); - return; } /*------------------------------------------------------------------------* @@ -766,7 +756,6 @@ zyd_cfg_rfwrite(struct zyd_softc *sc, uint32_t value) req.bit[i] |= htole16(ZYD_RF_DATA); } zyd_cfg_cmd(sc, ZYD_CMD_RFCFG, &req, 4 + (2 * rf->width), NULL, 0, 0); - return; } static void @@ -780,7 +769,6 @@ zyd_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~ZYD_FLAG_BULK_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -857,8 +845,6 @@ zyd_bulk_read_callback_sub(struct usb2_xfer *xfer, struct zyd_ifq *mq, m->m_hdr.pad[0] = stat.rssi; /* XXX hack */ } _IF_ENQUEUE(mq, m); - - return; } static void @@ -979,7 +965,6 @@ zyd_bulk_read_callback(struct usb2_xfer *xfer) } break; } - return; } /*------------------------------------------------------------------------* @@ -1170,7 +1155,6 @@ zyd_cfg_set_beacon_interval(struct zyd_softc *sc, uint32_t bintval) zyd_cfg_write32(sc, ZYD_CR_ATIM_WND_PERIOD, bintval - 2); zyd_cfg_write32(sc, ZYD_CR_PRE_TBTT, bintval - 1); zyd_cfg_write32(sc, ZYD_CR_BCN_INTERVAL, bintval); - return; } /* @@ -1208,7 +1192,6 @@ zyd_cfg_rf_rfmd_init(struct zyd_softc *sc, struct zyd_rf *rf) for (i = 0; i != INDEXES(rfini); i++) { zyd_cfg_rfwrite(sc, rfini[i]); } - return; } /* @@ -1219,7 +1202,6 @@ zyd_cfg_rf_rfmd_switch_radio(struct zyd_softc *sc, uint8_t on) { zyd_cfg_write16(sc, ZYD_CR10, on ? 0x89 : 0x15); zyd_cfg_write16(sc, ZYD_CR11, on ? 0x00 : 0x81); - return; } /* @@ -1235,7 +1217,6 @@ zyd_cfg_rf_rfmd_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, zyd_cfg_rfwrite(sc, rfprog[channel - 1].r1); zyd_cfg_rfwrite(sc, rfprog[channel - 1].r2); - return; } /* @@ -1248,7 +1229,6 @@ zyd_cfg_rf_al2230_switch_radio(struct zyd_softc *sc, uint8_t on) zyd_cfg_write16(sc, ZYD_CR11, on ? 0x00 : 0x04); zyd_cfg_write16(sc, ZYD_CR251, on ? on251 : 0x2f); - return; } /* @@ -1270,7 +1250,6 @@ zyd_cfg_rf_al2230_init(struct zyd_softc *sc, struct zyd_rf *rf) for (i = 0; i != INDEXES(rfini); i++) { zyd_cfg_rfwrite(sc, rfini[i]); } - return; } static void @@ -1289,7 +1268,6 @@ zyd_cfg_rf_al2230_init_b(struct zyd_softc *sc, struct zyd_rf *rf) for (i = 0; i != INDEXES(rfini); i++) { zyd_cfg_rfwrite(sc, rfini[i]); } - return; } /* @@ -1309,7 +1287,6 @@ zyd_cfg_rf_al2230_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, zyd_cfg_write16(sc, ZYD_CR138, 0x28); zyd_cfg_write16(sc, ZYD_CR203, 0x06); - return; } /* @@ -1320,7 +1297,6 @@ zyd_cfg_rf_al7230b_switch_radio(struct zyd_softc *sc, uint8_t on) { zyd_cfg_write16(sc, ZYD_CR11, on ? 0x00 : 0x04); zyd_cfg_write16(sc, ZYD_CR251, on ? 0x3f : 0x2f); - return; } static void @@ -1355,7 +1331,6 @@ zyd_cfg_rf_al7230b_init(struct zyd_softc *sc, struct zyd_rf *rf) for (i = 0; i != INDEXES(phyini_3); i++) { zyd_cfg_write16(sc, phyini_3[i].reg, phyini_3[i].val); } - return; } static void @@ -1389,7 +1364,6 @@ zyd_cfg_rf_al7230b_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, zyd_cfg_write16(sc, ZYD_CR203, 0x06); zyd_cfg_write16(sc, ZYD_CR240, 0x08); - return; } /* @@ -1427,8 +1401,6 @@ zyd_cfg_rf_al2210_init(struct zyd_softc *sc, struct zyd_rf *rf) zyd_cfg_write32(sc, ZYD_CR_RFCFG, 0x00); zyd_cfg_write16(sc, ZYD_CR47, 0x1e); zyd_cfg_write32(sc, ZYD_CR18, 3); - - return; } static void @@ -1452,7 +1424,6 @@ zyd_cfg_rf_al2210_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, zyd_cfg_rfwrite(sc, rfprog[channel - 1]); zyd_cfg_write32(sc, ZYD_CR18, 3); - return; } /* @@ -1462,8 +1433,6 @@ static void zyd_cfg_rf_gct_switch_radio(struct zyd_softc *sc, uint8_t on) { /* vendor driver does nothing for this RF chip */ - - return; } static void @@ -1481,7 +1450,6 @@ zyd_cfg_rf_gct_init(struct zyd_softc *sc, struct zyd_rf *rf) for (i = 0; i != INDEXES(rfini); i++) { zyd_cfg_rfwrite(sc, rfini[i]); } - return; } static void @@ -1493,8 +1461,6 @@ zyd_cfg_rf_gct_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, zyd_cfg_rfwrite(sc, 0x1c0000); zyd_cfg_rfwrite(sc, rfprog[channel - 1]); zyd_cfg_rfwrite(sc, 0x1c0008); - - return; } /* @@ -1505,7 +1471,6 @@ zyd_cfg_rf_maxim_switch_radio(struct zyd_softc *sc, uint8_t on) { /* vendor driver does nothing for this RF chip */ - return; } static void @@ -1529,8 +1494,6 @@ zyd_cfg_rf_maxim_init(struct zyd_softc *sc, struct zyd_rf *rf) } zyd_cfg_read16(sc, ZYD_CR203, &tmp); zyd_cfg_write16(sc, ZYD_CR203, tmp | (1 << 4)); - - return; } static void @@ -1569,8 +1532,6 @@ zyd_cfg_rf_maxim_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, } zyd_cfg_read16(sc, ZYD_CR203, &tmp); zyd_cfg_write16(sc, ZYD_CR203, tmp | (1 << 4)); - - return; } /* @@ -1580,7 +1541,6 @@ static void zyd_cfg_rf_maxim2_switch_radio(struct zyd_softc *sc, uint8_t on) { /* vendor driver does nothing for this RF chip */ - return; } static void @@ -1604,7 +1564,6 @@ zyd_cfg_rf_maxim2_init(struct zyd_softc *sc, struct zyd_rf *rf) } zyd_cfg_read16(sc, ZYD_CR203, &tmp); zyd_cfg_write16(sc, ZYD_CR203, tmp | (1 << 4)); - return; } static void @@ -1643,7 +1602,6 @@ zyd_cfg_rf_maxim2_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, } zyd_cfg_read16(sc, ZYD_CR203, &tmp); zyd_cfg_write16(sc, ZYD_CR203, tmp | (1 << 4)); - return; } /* @@ -1843,7 +1801,6 @@ zyd_cfg_read_eeprom(struct zyd_softc *sc) sc->sc_ofdm54_cal[(i * 2)] = val >> 8; sc->sc_ofdm54_cal[(i * 2) + 1] = val & 0xff; } - return; } static void @@ -1856,7 +1813,6 @@ zyd_cfg_set_mac_addr(struct zyd_softc *sc, const uint8_t *addr) tmp = (addr[5] << 8) | addr[4]; zyd_cfg_write32(sc, ZYD_MAC_MACADRH, tmp); - return; } /* @@ -1868,8 +1824,6 @@ zyd_cfg_switch_radio(struct zyd_softc *sc, uint8_t onoff) zyd_cfg_lock_phy(sc); (sc->sc_rf.cfg_switch_radio) (sc, onoff); zyd_cfg_unlock_phy(sc); - - return; } /* @@ -1885,7 +1839,6 @@ zyd_cfg_set_bssid(struct zyd_softc *sc, uint8_t *addr) tmp = (addr[5] << 8) | addr[4]; zyd_cfg_write32(sc, ZYD_MAC_BSSADRH, tmp); - return; } /* @@ -2118,7 +2071,6 @@ zyd_cfg_newstate(struct zyd_softc *sc, vap->iv_newstate_cb(vap, nstate, arg); IEEE80211_UNLOCK(ic); mtx_lock(&sc->sc_mtx); - return; } static void @@ -2140,7 +2092,6 @@ zyd_cfg_set_run(struct zyd_softc *sc, /* enable automatic rate adaptation */ zyd_cfg_amrr_start(sc); } - return; } static int @@ -2200,7 +2151,6 @@ zyd_cfg_update_promisc(struct zyd_softc *sc, /* reprogram multicast global hash table */ zyd_cfg_write32(sc, ZYD_MAC_GHTBL, low); zyd_cfg_write32(sc, ZYD_MAC_GHTBH, high); - return; } /* @@ -2259,29 +2209,24 @@ zyd_std_command(struct ieee80211com *ic, usb2_config_td_command_t *func) (&sc->sc_config_td, &zyd_config_copy, func, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static void zyd_scan_start_cb(struct ieee80211com *ic) { zyd_std_command(ic, &zyd_cfg_scan_start); - return; } static void zyd_scan_end_cb(struct ieee80211com *ic) { zyd_std_command(ic, &zyd_cfg_scan_end); - return; } static void zyd_set_channel_cb(struct ieee80211com *ic) { zyd_std_command(ic, &zyd_cfg_set_chan); - return; } /*========================================================================* @@ -2293,7 +2238,6 @@ zyd_cfg_scan_start(struct zyd_softc *sc, struct usb2_config_td_cc *cc, uint16_t refcount) { zyd_cfg_set_bssid(sc, cc->if_broadcastaddr); - return; } static void @@ -2301,7 +2245,6 @@ zyd_cfg_scan_end(struct zyd_softc *sc, struct usb2_config_td_cc *cc, uint16_t refcount) { zyd_cfg_set_bssid(sc, cc->iv_bss.ni_bssid); - return; } static void @@ -2352,8 +2295,6 @@ zyd_cfg_set_chan(struct zyd_softc *sc, sc->sc_rxtap.wr_chan_flags = sc->sc_txtap.wt_chan_flags = htole16(cc->ic_flags); - - return; } /* @@ -2376,8 +2317,6 @@ zyd_cfg_pre_init(struct zyd_softc *sc, sc->sc_flags |= ZYD_FLAG_HL_READY; IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); - - return; } /* delayed configuration */ @@ -2453,7 +2392,6 @@ zyd_cfg_init(struct zyd_softc *sc, ieee80211_start_all(ic); mtx_lock(&sc->sc_mtx); } - return; } /* immediate configuration */ @@ -2485,7 +2423,6 @@ zyd_cfg_pre_stop(struct zyd_softc *sc, /* clean up transmission */ zyd_tx_clean_queue(sc); - return; } /* delayed configuration */ @@ -2502,8 +2439,6 @@ zyd_cfg_stop(struct zyd_softc *sc, /* disable interrupts */ zyd_cfg_write32(sc, ZYD_CR_INTERRUPT, 0); - - return; } static void @@ -2516,7 +2451,6 @@ zyd_update_mcast_cb(struct ifnet *ifp) (&sc->sc_config_td, &zyd_config_copy, &zyd_cfg_update_promisc, 0, 0); mtx_unlock(&sc->sc_mtx); - return; } static void @@ -2529,7 +2463,6 @@ zyd_update_promisc_cb(struct ifnet *ifp) (&sc->sc_config_td, &zyd_config_copy, &zyd_cfg_update_promisc, 0, 0); mtx_unlock(&sc->sc_mtx); - return; } static void @@ -2554,7 +2487,6 @@ zyd_cfg_set_rxfilter(struct zyd_softc *sc, return; } zyd_cfg_write32(sc, ZYD_MAC_RXFILTER, rxfilter); - return; } static void @@ -2569,7 +2501,6 @@ zyd_cfg_set_led(struct zyd_softc *sc, uint32_t which, uint8_t on) tmp &= ~which; zyd_cfg_write32(sc, ZYD_MAC_TX_PE_CONTROL, tmp); - return; } static void @@ -2580,7 +2511,6 @@ zyd_start_cb(struct ifnet *ifp) mtx_lock(&sc->sc_mtx); usb2_transfer_start(sc->sc_xfer[ZYD_TR_BULK_DT_WR]); mtx_unlock(&sc->sc_mtx); - return; } static void @@ -2594,7 +2524,6 @@ zyd_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) sc->sc_flags &= ~ZYD_FLAG_BULK_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } /* @@ -2693,7 +2622,6 @@ zyd_setup_desc_and_tx(struct zyd_softc *sc, struct mbuf *m, _IF_ENQUEUE(&sc->sc_tx_queue, mm); usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -2765,7 +2693,6 @@ zyd_bulk_write_callback(struct usb2_xfer *xfer) ifp->if_oerrors++; break; } - return; } static void @@ -2778,8 +2705,6 @@ zyd_init_cb(void *arg) (&sc->sc_config_td, &zyd_cfg_pre_init, &zyd_cfg_init, 0, 0); mtx_unlock(&sc->sc_mtx); - - return; } static int @@ -2838,8 +2763,6 @@ zyd_watchdog(void *arg) hz, &zyd_watchdog, sc); mtx_unlock(&sc->sc_mtx); - - return; } static void @@ -2865,7 +2788,6 @@ zyd_config_copy_chan(struct zyd_config_copy_chan *cc, if (IEEE80211_IS_CHAN_ANYG(c)) cc->chan_is_g = 1; } - return; } static void @@ -2932,7 +2854,6 @@ zyd_config_copy(struct zyd_softc *sc, } } sc->sc_flags |= ZYD_FLAG_WAIT_COMMAND; - return; } static void @@ -2942,7 +2863,6 @@ zyd_end_of_commands(struct zyd_softc *sc) /* start write transfer, if not started */ usb2_transfer_start(sc->sc_xfer[0]); - return; } static void @@ -2951,7 +2871,6 @@ zyd_newassoc_cb(struct ieee80211_node *ni, int isnew) struct ieee80211vap *vap = ni->ni_vap; ieee80211_amrr_node_init(&ZYD_VAP(vap)->amrr, &ZYD_NODE(ni)->amn, ni); - return; } static void @@ -2979,7 +2898,6 @@ zyd_cfg_amrr_timeout(struct zyd_softc *sc, } } } - return; } static void @@ -3004,7 +2922,6 @@ zyd_cfg_amrr_start(struct zyd_softc *sc) /* enable AMRR timer */ sc->sc_amrr_timer = 1; - return; } static struct ieee80211vap * @@ -3069,7 +2986,6 @@ zyd_vap_delete(struct ieee80211vap *vap) ieee80211_amrr_cleanup(&zvp->amrr); ieee80211_vap_detach(vap); free(zvp, M_80211_VAP); - return; } /* ARGUSED */ @@ -3109,7 +3025,6 @@ zyd_fill_write_queue(struct zyd_softc *sc) } zyd_tx_data(sc, m, ni); } - return; } static void @@ -3125,8 +3040,6 @@ zyd_tx_clean_queue(struct zyd_softc *sc) } zyd_tx_freem(m); } - - return; } static void @@ -3148,7 +3061,6 @@ zyd_tx_freem(struct mbuf *m) break; } - return; } static void @@ -3201,7 +3113,6 @@ zyd_tx_mgt(struct zyd_softc *sc, struct mbuf *m, struct ieee80211_node *ni) m->m_pkthdr.rcvif = (void *)ni; zyd_setup_desc_and_tx(sc, m, rate); - return; } static void @@ -3261,7 +3172,6 @@ zyd_tx_data(struct zyd_softc *sc, struct mbuf *m, struct ieee80211_node *ni) m->m_pkthdr.rcvif = (void *)ni; zyd_setup_desc_and_tx(sc, m, rate); - return; } static int