diff options
author | thompsa <thompsa@FreeBSD.org> | 2008-12-11 23:17:48 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2008-12-11 23:17:48 +0000 |
commit | 509ce401ea8d49b634f2041c35c407a0d4e7d980 (patch) | |
tree | ae90a4775f819938ce76a2ac57532430f074e627 /sys/dev/usb2/controller/uhci2.c | |
parent | f0bc2443fb563ef6515d23cfb540d20ed77bba6e (diff) | |
download | FreeBSD-src-509ce401ea8d49b634f2041c35c407a0d4e7d980.zip FreeBSD-src-509ce401ea8d49b634f2041c35c407a0d4e7d980.tar.gz |
Remove superfluous return statements from the end of void functions.
Diffstat (limited to 'sys/dev/usb2/controller/uhci2.c')
-rw-r--r-- | sys/dev/usb2/controller/uhci2.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/sys/dev/usb2/controller/uhci2.c b/sys/dev/usb2/controller/uhci2.c index ae03b8d..ceb87e6 100644 --- a/sys/dev/usb2/controller/uhci2.c +++ b/sys/dev/usb2/controller/uhci2.c @@ -182,7 +182,6 @@ uhci_iterate_hw_softc(struct usb2_bus *bus, usb2_bus_mem_sub_cb_t *cb) sc->sc_hw.intr_start_pg + i, sizeof(uhci_qh_t), UHCI_QH_ALIGN); } - return; } static void @@ -194,8 +193,6 @@ uhci_mem_layout_init(struct uhci_mem_layout *ml, struct usb2_xfer *xfer) ml->buf_offset = 0; ml->max_frame_size = xfer->max_frame_size; - - return; } static void @@ -255,8 +252,6 @@ uhci_mem_layout_fixup(struct uhci_mem_layout *ml, struct uhci_td *td) /* prepare next data location */ ml->buf_offset += td->len; - - return; } void @@ -326,7 +321,6 @@ done_2: UWRITE4(sc, UHCI_FLBASEADDR, buf_res.physaddr); UWRITE2(sc, UHCI_FRNUM, sc->sc_saved_frnum); UWRITE1(sc, UHCI_SOF, sc->sc_saved_sof); - return; } static void @@ -651,7 +645,6 @@ uhci_suspend(uhci_softc_t *sc) usb2_pause_mtx(&sc->sc_bus.bus_mtx, USB_RESUME_WAIT); USB_BUS_UNLOCK(&sc->sc_bus); - return; } void @@ -684,8 +677,6 @@ uhci_resume(uhci_softc_t *sc) /* catch lost interrupts */ uhci_do_poll(&sc->sc_bus); - - return; } #if USB_DEBUG @@ -703,7 +694,6 @@ uhci_dumpregs(uhci_softc_t *sc) UREAD1(sc, UHCI_SOF), UREAD2(sc, UHCI_PORTSC1), UREAD2(sc, UHCI_PORTSC2)); - return; } static uint8_t @@ -792,7 +782,6 @@ uhci_dump_all(uhci_softc_t *sc) uhci_dump_qh(sc->sc_fs_ctl_p_last); uhci_dump_qh(sc->sc_bulk_p_last); uhci_dump_qh(sc->sc_last_qh_p); - return; } static void @@ -820,8 +809,6 @@ uhci_dump_qhs(uhci_qh_t *sqh) uhci_dump_tds(sqh->e_next); else DPRINTF("No TD\n"); - - return; } static void @@ -834,7 +821,6 @@ uhci_dump_tds(uhci_td_t *td) break; } } - return; } #endif @@ -867,7 +853,6 @@ uhci_add_loop(uhci_softc_t *sc) qh_lst->qh_h_next = qh_rec->qh_self; usb2_pc_cpu_flush(qh_lst->page_cache); } - return; } static void @@ -887,7 +872,6 @@ uhci_rem_loop(uhci_softc_t *sc) qh_lst->qh_h_next = htole32(UHCI_PTR_T); usb2_pc_cpu_flush(qh_lst->page_cache); } - return; } static void @@ -904,7 +888,6 @@ uhci_transfer_intr_enqueue(struct usb2_xfer *xfer) if (xfer->timeout != 0) { usb2_transfer_timeout_ms(xfer, &uhci_timeout, xfer->timeout); } - return; } #define UHCI_APPEND_TD(std,last) (last) = _uhci_append_td(std,last) @@ -1088,8 +1071,6 @@ uhci_isoc_done(uhci_softc_t *sc, struct usb2_xfer *xfer) } xfer->aframes = xfer->nframes; - - return; } static usb2_error_t @@ -1255,7 +1236,6 @@ uhci_non_isoc_done(struct usb2_xfer *xfer) } done: uhci_device_done(xfer, err); - return; } /*------------------------------------------------------------------------* @@ -1312,7 +1292,6 @@ uhci_check_transfer_sub(struct usb2_xfer *xfer) usb2_pc_cpu_flush(qh->page_cache); DPRINTFN(13, "xfer=%p following alt next\n", xfer); - return; } /*------------------------------------------------------------------------* @@ -1433,7 +1412,6 @@ repeat: goto repeat; } } - return; } /*------------------------------------------------------------------------* @@ -1507,7 +1485,6 @@ uhci_interrupt(uhci_softc_t *sc) done: USB_BUS_UNLOCK(&sc->sc_bus); - return; } /* @@ -1527,8 +1504,6 @@ uhci_timeout(void *arg) uhci_device_done(xfer, USB_ERR_TIMEOUT); USB_BUS_UNLOCK(&sc->sc_bus); - - return; } static void @@ -1540,7 +1515,6 @@ uhci_do_poll(struct usb2_bus *bus) uhci_interrupt_poll(sc); uhci_root_ctrl_poll(sc); USB_BUS_UNLOCK(&sc->sc_bus); - return; } static void @@ -1684,8 +1658,6 @@ restart: } temp->td = td; temp->td_next = td_next; - - return; } static uhci_td_t * @@ -1902,7 +1874,6 @@ uhci_device_done(struct usb2_xfer *xfer, usb2_error_t error) } /* dequeue transfer and start next transfer */ usb2_transfer_done(xfer, error); - return; } /*------------------------------------------------------------------------* @@ -1918,7 +1889,6 @@ static void uhci_device_bulk_close(struct usb2_xfer *xfer) { uhci_device_done(xfer, USB_ERR_CANCELLED); - return; } static void @@ -1946,7 +1916,6 @@ uhci_device_bulk_start(struct usb2_xfer *xfer) /* put transfer on interrupt queue */ uhci_transfer_intr_enqueue(xfer); - return; } struct usb2_pipe_methods uhci_device_bulk_methods = @@ -1972,7 +1941,6 @@ static void uhci_device_ctrl_close(struct usb2_xfer *xfer) { uhci_device_done(xfer, USB_ERR_CANCELLED); - return; } static void @@ -2005,7 +1973,6 @@ uhci_device_ctrl_start(struct usb2_xfer *xfer) } /* put transfer on interrupt queue */ uhci_transfer_intr_enqueue(xfer); - return; } struct usb2_pipe_methods uhci_device_ctrl_methods = @@ -2052,7 +2019,6 @@ uhci_device_intr_open(struct usb2_xfer *xfer) DPRINTFN(3, "best=%d interval=%d\n", best, xfer->interval); - return; } static void @@ -2063,7 +2029,6 @@ uhci_device_intr_close(struct usb2_xfer *xfer) sc->sc_intr_stat[xfer->qh_pos]--; uhci_device_done(xfer, USB_ERR_CANCELLED); - return; } static void @@ -2090,7 +2055,6 @@ uhci_device_intr_start(struct usb2_xfer *xfer) /* put transfer on interrupt queue */ uhci_transfer_intr_enqueue(xfer); - return; } struct usb2_pipe_methods uhci_device_intr_methods = @@ -2133,14 +2097,12 @@ uhci_device_isoc_open(struct usb2_xfer *xfer) usb2_pc_cpu_flush(td->page_cache); } } - return; } static void uhci_device_isoc_close(struct usb2_xfer *xfer) { uhci_device_done(xfer, USB_ERR_CANCELLED); - return; } static void @@ -2296,8 +2258,6 @@ uhci_device_isoc_enter(struct usb2_xfer *xfer) /* update isoc_next */ xfer->pipe->isoc_next = (pp_last - &sc->sc_isoc_p_last[0]) & (UHCI_VFRAMELIST_COUNT - 1); - - return; } static void @@ -2305,7 +2265,6 @@ uhci_device_isoc_start(struct usb2_xfer *xfer) { /* put transfer on interrupt queue */ uhci_transfer_intr_enqueue(xfer); - return; } struct usb2_pipe_methods uhci_device_isoc_methods = @@ -2340,7 +2299,6 @@ uhci_root_ctrl_close(struct usb2_xfer *xfer) sc->sc_root_ctrl.xfer = NULL; } uhci_device_done(xfer, USB_ERR_CANCELLED); - return; } /* data structures and routines @@ -2534,8 +2492,6 @@ uhci_root_ctrl_start(struct usb2_xfer *xfer) usb2_config_td_queue_command (&sc->sc_config_td, NULL, &uhci_root_ctrl_task, 0, 0); - - return; } static void @@ -2543,7 +2499,6 @@ uhci_root_ctrl_task(struct uhci_softc *sc, struct uhci_config_copy *cc, uint16_t refcount) { uhci_root_ctrl_poll(sc); - return; } static void @@ -2855,7 +2810,6 @@ uhci_root_ctrl_poll(struct uhci_softc *sc) { usb2_sw_transfer(&sc->sc_root_ctrl, &uhci_root_ctrl_done); - return; } struct usb2_pipe_methods uhci_root_ctrl_methods = @@ -2886,7 +2840,6 @@ uhci_root_intr_close(struct usb2_xfer *xfer) sc->sc_root_intr.xfer = NULL; } uhci_device_done(xfer, USB_ERR_CANCELLED); - return; } static void @@ -2904,7 +2857,6 @@ uhci_root_intr_start(struct usb2_xfer *xfer) usb2_transfer_timeout_ms(xfer, &uhci_root_intr_check, xfer->interval); - return; } static void @@ -2961,7 +2913,6 @@ uhci_root_intr_check(void *arg) &uhci_root_intr_done); } USB_BUS_UNLOCK(&sc->sc_bus); - return; } struct usb2_pipe_methods uhci_root_intr_methods = @@ -3173,7 +3124,6 @@ alloc_dma_set: xfer->flags_int.curr_dma_set = 1; goto alloc_dma_set; } - return; } static void @@ -3226,7 +3176,6 @@ uhci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc, break; } } - return; } static void @@ -3243,7 +3192,6 @@ uhci_get_dma_delay(struct usb2_bus *bus, uint32_t *pus) * transfer descriptor(s) and QH */ *pus = (1125); /* microseconds */ - return; } struct usb2_bus_methods uhci_bus_methods = |