Date: Thu, 11 Dec 2008 23:17:48 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r185950 - in head/sys/dev/usb2: bluetooth controller core ethernet image input misc quirk serial sound storage template wlan Message-ID: <200812112317.mBBNHm77079533@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Thu Dec 11 23:17:48 2008 New Revision: 185950 URL: http://svn.freebsd.org/changeset/base/185950 Log: Remove superfluous return statements from the end of void functions. Modified: head/sys/dev/usb2/bluetooth/ng_ubt2.c head/sys/dev/usb2/bluetooth/ubtbcmfw2.c head/sys/dev/usb2/controller/at91dci.c head/sys/dev/usb2/controller/at91dci_atmelarm.c head/sys/dev/usb2/controller/ehci2.c head/sys/dev/usb2/controller/ehci2_pci.c head/sys/dev/usb2/controller/musb2_otg.c head/sys/dev/usb2/controller/musb2_otg_atmelarm.c head/sys/dev/usb2/controller/ohci2.c head/sys/dev/usb2/controller/uhci2.c head/sys/dev/usb2/controller/usb2_controller.c head/sys/dev/usb2/controller/uss820dci.c head/sys/dev/usb2/core/usb2_busdma.c head/sys/dev/usb2/core/usb2_compat_linux.c head/sys/dev/usb2/core/usb2_config_td.c head/sys/dev/usb2/core/usb2_debug.c head/sys/dev/usb2/core/usb2_dev.c head/sys/dev/usb2/core/usb2_device.c head/sys/dev/usb2/core/usb2_dynamic.c head/sys/dev/usb2/core/usb2_generic.c head/sys/dev/usb2/core/usb2_handle_request.c head/sys/dev/usb2/core/usb2_hub.c head/sys/dev/usb2/core/usb2_msctest.c head/sys/dev/usb2/core/usb2_process.c head/sys/dev/usb2/core/usb2_request.c head/sys/dev/usb2/core/usb2_sw_transfer.c head/sys/dev/usb2/core/usb2_transfer.c head/sys/dev/usb2/core/usb2_util.c head/sys/dev/usb2/ethernet/if_aue2.c head/sys/dev/usb2/ethernet/if_axe2.c head/sys/dev/usb2/ethernet/if_cdce2.c head/sys/dev/usb2/ethernet/if_cue2.c head/sys/dev/usb2/ethernet/if_kue2.c head/sys/dev/usb2/ethernet/if_rue2.c head/sys/dev/usb2/ethernet/if_udav2.c head/sys/dev/usb2/ethernet/usb2_ethernet.c head/sys/dev/usb2/image/uscanner2.c head/sys/dev/usb2/input/uhid2.c head/sys/dev/usb2/input/ukbd2.c head/sys/dev/usb2/input/ums2.c head/sys/dev/usb2/misc/udbp2.c head/sys/dev/usb2/quirk/usb2_quirk.c head/sys/dev/usb2/serial/uark2.c head/sys/dev/usb2/serial/ubsa2.c head/sys/dev/usb2/serial/ubser2.c head/sys/dev/usb2/serial/uchcom2.c head/sys/dev/usb2/serial/ucycom2.c head/sys/dev/usb2/serial/ufoma2.c head/sys/dev/usb2/serial/uftdi2.c head/sys/dev/usb2/serial/ugensa2.c head/sys/dev/usb2/serial/uipaq2.c head/sys/dev/usb2/serial/ulpt2.c head/sys/dev/usb2/serial/umct2.c head/sys/dev/usb2/serial/umodem2.c head/sys/dev/usb2/serial/umoscom2.c head/sys/dev/usb2/serial/uplcom2.c head/sys/dev/usb2/serial/usb2_serial.c head/sys/dev/usb2/serial/uvisor2.c head/sys/dev/usb2/serial/uvscom2.c head/sys/dev/usb2/sound/uaudio2.c head/sys/dev/usb2/storage/ata-usb2.c head/sys/dev/usb2/storage/umass2.c head/sys/dev/usb2/storage/urio2.c head/sys/dev/usb2/storage/ustorage2_fs.c head/sys/dev/usb2/template/usb2_template.c head/sys/dev/usb2/wlan/if_rum2.c head/sys/dev/usb2/wlan/if_ural2.c head/sys/dev/usb2/wlan/if_zyd2.c Modified: head/sys/dev/usb2/bluetooth/ng_ubt2.c ============================================================================== --- head/sys/dev/usb2/bluetooth/ng_ubt2.c Thu Dec 11 23:15:15 2008 (r185949) +++ head/sys/dev/usb2/bluetooth/ng_ubt2.c Thu Dec 11 23:17:48 2008 (r185950) @@ -818,7 +818,6 @@ ubt_intr_read_clear_stall_callback(struc sc->sc_flags &= ~UBT_FLAG_INTR_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -883,8 +882,6 @@ done: 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(struc sc->sc_flags &= ~UBT_FLAG_READ_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1040,8 +1036,6 @@ done: 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(stru sc->sc_flags &= ~UBT_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -1265,8 +1258,6 @@ done: } mtx_unlock(&sc->sc_mtx); - - return; } static void Modified: head/sys/dev/usb2/bluetooth/ubtbcmfw2.c ============================================================================== --- head/sys/dev/usb2/bluetooth/ubtbcmfw2.c Thu Dec 11 23:15:15 2008 (r185949) +++ head/sys/dev/usb2/bluetooth/ubtbcmfw2.c Thu Dec 11 23:17:48 2008 (r185950) @@ -305,7 +305,6 @@ ubtbcmfw_write_clear_stall_callback(stru sc->sc_flags &= ~UBTBCMFW_FLAG_WRITE_STALL; usb2_transfer_start(xfer_other); } - return; } static void @@ -351,7 +350,6 @@ ubtbcmfw_read_clear_stall_callback(struc 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 *fi 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 *fif 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 *f 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 *fi 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, i if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); } - return; } static int Modified: head/sys/dev/usb2/controller/at91dci.c ============================================================================== --- head/sys/dev/usb2/controller/at91dci.c Thu Dec 11 23:15:15 2008 (r185949) +++ head/sys/dev/usb2/controller/at91dci.c Thu Dec 11 23:17:48 2008 (r185950) @@ -200,7 +200,6 @@ at91dci_get_hw_ep_profile(struct usb2_de } else { *ppf = NULL; } - return; } static void @@ -219,7 +218,6 @@ at91dci_clocks_on(struct at91dci_softc * /* 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_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_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 return; } AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, temp); - - return; } static void @@ -304,8 +297,6 @@ at91dci_rem_wakeup_set(struct usb2_devic } AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, temp); - - return; } static void @@ -315,8 +306,6 @@ at91dci_set_address(struct at91dci_softc AT91_UDP_WRITE_4(sc, AT91_UDP_FADDR, addr | AT91_UDP_FADDR_EN); - - return; } static uint8_t @@ -756,7 +745,6 @@ repeat: goto repeat; } } - return; } static void @@ -792,8 +780,6 @@ at91dci_vbus_interrupt(struct usb2_bus * } USB_BUS_UNLOCK(&sc->sc_bus); - - return; } void @@ -880,8 +866,6 @@ at91dci_interrupt(struct at91dci_softc * at91dci_interrupt_poll(sc); } USB_BUS_UNLOCK(&sc->sc_bus); - - return; } static void @@ -906,7 +890,6 @@ at91dci_setup_standard_chain_sub(struct 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 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 &at91dci_timeout, xfer->timeout); } } - return; } static void @@ -1240,7 +1219,6 @@ at91dci_standard_done(struct usb2_xfer * } done: at91dci_device_done(xfer, err); - return; } /*------------------------------------------------------------------------* @@ -1270,7 +1248,6 @@ at91dci_device_done(struct usb2_xfer *xf } /* dequeue transfer and start next transfer */ usb2_transfer_done(xfer, error); - return; } static void @@ -1296,7 +1273,6 @@ at91dci_set_stall(struct usb2_device *ud 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_s /* 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 * (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_xf /* 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_xf /* 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_xf /* 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 /* setup TDs */ at91dci_setup_standard_chain(xfer); - return; } static void @@ -1736,7 +1698,6 @@ at91dci_device_isoc_fs_start(struct usb2 { /* 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 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 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_so 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_so { 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 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 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_par } xfer->td_start[0] = last_obj; - return; } static void @@ -2530,7 +2483,6 @@ at91dci_pipe_init(struct usb2_device *ud break; } } - return; } struct usb2_bus_methods at91dci_bus_methods = Modified: head/sys/dev/usb2/controller/at91dci_atmelarm.c ============================================================================== --- head/sys/dev/usb2/controller/at91dci_atmelarm.c Thu Dec 11 23:15:15 2008 (r185949) +++ head/sys/dev/usb2/controller/at91dci_atmelarm.c Thu Dec 11 23:17:48 2008 (r185950) @@ -87,7 +87,6 @@ at91_vbus_interrupt(struct at91_udp_soft 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 Modified: head/sys/dev/usb2/controller/ehci2.c ============================================================================== --- head/sys/dev/usb2/controller/ehci2.c Thu Dec 11 23:15:15 2008 (r185949) +++ head/sys/dev/usb2/controller/ehci2.c Thu Dec 11 23:17:48 2008 (r185950) @@ -152,7 +152,6 @@ ehci_iterate_hw_softc(struct usb2_bus *b 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_x 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 *xfe } done: ehci_device_done(xfer, err); - return; } /*------------------------------------------------------------------------* @@ -1429,7 +1413,6 @@ ehci_pcd_enable(ehci_softc_t *sc) &ehci_root_intr_done); USB_BUS_UNLOCK(&sc->sc_bus); - return; } static void @@ -1447,7 +1430,6 @@ repeat: goto repeat; } } - return; } /*------------------------------------------------------------------------* @@ -1520,7 +1502,6 @@ ehci_interrupt(ehci_softc_t *sc) done: USB_BUS_UNLOCK(&sc->sc_bus); - return; } /* @@ -1540,8 +1521,6 @@ ehci_timeout(void *arg) ehci_device_done(xfer, USB_ERR_TIMEOUT); USB_BUS_UNLOCK(&sc->sc_bus); - - return; } static void @@ -1553,7 +1532,6 @@ ehci_do_poll(struct usb2_bus *bus) ehci_interrupt_poll(sc); ehci_root_ctrl_poll(sc); USB_BUS_UNLOCK(&sc->sc_bus); - return; } static void @@ -1726,8 +1704,6 @@ restart: } temp->td = td; temp->td_next = td_next; - - return; } static void @@ -1956,7 +1932,6 @@ ehci_setup_standard_chain(struct usb2_xf 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, stru } xfer->aframes = xfer->nframes; - - return; } static void @@ -2113,8 +2086,6 @@ ehci_isoc_hs_done(ehci_softc_t *sc, stru } } 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, } /* 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 /* 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 /* 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 * DPRINTFN(3, "best=%d interval=%d\n", best, xfer->interval); - return; } static void @@ -2327,7 +2292,6 @@ ehci_device_intr_close(struct usb2_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 /* 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_xfe 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_xf /* 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_xf { /* 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_xfe 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_xf /* 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_xf { /* 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 *x 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 *x 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 *s 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 *s { 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 *x 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 *x ehci_softc_t *sc = xfer->usb2_sc; sc->sc_root_intr.xfer = xfer; - return; } struct usb2_pipe_methods ehci_root_intr_methods = @@ -3772,7 +3718,6 @@ alloc_dma_set: xfer->flags_int.curr_dma_set = 1; goto alloc_dma_set; } - return; } static void @@ -3853,7 +3798,6 @@ ehci_get_dma_delay(struct usb2_bus *bus, * the transfer descriptor(s) and QH */ *pus = (188); /* microseconds */ - return; } struct usb2_bus_methods ehci_bus_methods = Modified: head/sys/dev/usb2/controller/ehci2_pci.c ============================================================================== --- head/sys/dev/usb2/controller/ehci2_pci.c Thu Dec 11 23:15:15 2008 (r185949) +++ head/sys/dev/usb2/controller/ehci2_pci.c Thu Dec 11 23:17:48 2008 (r185950) @@ -468,7 +468,6 @@ ehci_pci_takecontroller(device_t self) usb2_pause_mtx(NULL, 10); /* wait 10ms */ } } - return; } static driver_t ehci_driver = Modified: head/sys/dev/usb2/controller/musb2_otg.c ============================================================================== --- head/sys/dev/usb2/controller/musb2_otg.c Thu Dec 11 23:15:15 2008 (r185949) +++ head/sys/dev/usb2/controller/musb2_otg.c Thu Dec 11 23:17:48 2008 (r185950) @@ -133,7 +133,6 @@ musbotg_get_hw_ep_profile(struct usb2_de } else { *ppf = NULL; } - return; } static void @@ -151,7 +150,6 @@ musbotg_clocks_on(struct musbotg_softc * /* XXX enable Transceiver */ } - return; } static void @@ -168,7 +166,6 @@ musbotg_clocks_off(struct musbotg_softc } sc->sc_flags.clocks_off = 1; } - return; } static void @@ -183,7 +180,6 @@ musbotg_pull_common(struct musbotg_softc 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_flags.d_pulled_up = 0; musbotg_pull_common(sc, 0); } - return; } static void @@ -239,14 +233,12 @@ musbotg_wakeup_peer(struct usb2_xfer *xf 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 DPRINTFN(4, "addr=%d\n", addr); addr &= 0x7F; MUSB2_WRITE_1(sc, MUSB2_REG_FADDR, addr); - return; } static uint8_t @@ -971,8 +962,6 @@ repeat: goto repeat; } } - - return; } static void @@ -1008,8 +997,6 @@ musbotg_vbus_interrupt(struct usb2_bus * } USB_BUS_UNLOCK(&sc->sc_bus); - - return; } void @@ -1117,8 +1104,6 @@ repeat: goto repeat; USB_BUS_UNLOCK(&sc->sc_bus); - - return; } static void @@ -1142,7 +1127,6 @@ musbotg_setup_standard_chain_sub(struct 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 /* 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 *xfe MUSB2_WRITE_2(sc, MUSB2_REG_INTTXE, temp); } } - return; } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812112317.mBBNHm77079533>