aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb2/controller/ohci2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb2/controller/ohci2.c')
-rw-r--r--sys/dev/usb2/controller/ohci2.c44
1 files changed, 0 insertions, 44 deletions
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 @@ repeat:
goto repeat;
}
}
- return;
}
/*------------------------------------------------------------------------*
@@ -1247,7 +1231,6 @@ ohci_interrupt(ohci_softc_t *sc)
done:
USB_BUS_UNLOCK(&sc->sc_bus);
- return;
}
/*
@@ -1267,8 +1250,6 @@ ohci_timeout(void *arg)
ohci_device_done(xfer, USB_ERR_TIMEOUT);
USB_BUS_UNLOCK(&sc->sc_bus);
-
- return;
}
static void
@@ -1280,7 +1261,6 @@ ohci_do_poll(struct usb2_bus *bus)
ohci_interrupt_poll(sc);
ohci_root_ctrl_poll(sc);
USB_BUS_UNLOCK(&sc->sc_bus);
- return;
}
static void
@@ -1423,8 +1403,6 @@ restart:
}
temp->td = td;
temp->td_next = td_next;
-
- return;
}
static void
@@ -1605,7 +1583,6 @@ ohci_setup_standard_chain(struct usb2_xfer *xfer, ohci_ed_t **ed_last)
OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF);
}
- return;
}
static void
@@ -1690,7 +1667,6 @@ ohci_device_done(struct usb2_xfer *xfer, usb2_error_t error)
/* dequeue transfer and start next transfer */
usb2_transfer_done(xfer, error);
- return;
}
/*------------------------------------------------------------------------*
@@ -1706,7 +1682,6 @@ static void
ohci_device_bulk_close(struct usb2_xfer *xfer)
{
ohci_device_done(xfer, USB_ERR_CANCELLED);
- return;
}
static void
@@ -1725,7 +1700,6 @@ ohci_device_bulk_start(struct usb2_xfer *xfer)
/* put transfer on interrupt queue */
ohci_transfer_intr_enqueue(xfer);
- return;
}
struct usb2_pipe_methods ohci_device_bulk_methods =
@@ -1751,7 +1725,6 @@ static void
ohci_device_ctrl_close(struct usb2_xfer *xfer)
{
ohci_device_done(xfer, USB_ERR_CANCELLED);
- return;
}
static void
@@ -1770,7 +1743,6 @@ ohci_device_ctrl_start(struct usb2_xfer *xfer)
/* put transfer on interrupt queue */
ohci_transfer_intr_enqueue(xfer);
- return;
}
struct usb2_pipe_methods ohci_device_ctrl_methods =
@@ -1817,7 +1789,6 @@ ohci_device_intr_open(struct usb2_xfer *xfer)
DPRINTFN(3, "best=%d interval=%d\n",
best, xfer->interval);
- return;
}
static void
@@ -1828,7 +1799,6 @@ ohci_device_intr_close(struct usb2_xfer *xfer)
sc->sc_intr_stat[xfer->qh_pos]--;
ohci_device_done(xfer, USB_ERR_CANCELLED);
- return;
}
static void
@@ -1847,7 +1817,6 @@ ohci_device_intr_start(struct usb2_xfer *xfer)
/* put transfer on interrupt queue */
ohci_transfer_intr_enqueue(xfer);
- return;
}
struct usb2_pipe_methods ohci_device_intr_methods =
@@ -1874,7 +1843,6 @@ ohci_device_isoc_close(struct usb2_xfer *xfer)
{
/**/
ohci_device_done(xfer, USB_ERR_CANCELLED);
- return;
}
static void
@@ -2049,7 +2017,6 @@ ohci_device_isoc_enter(struct usb2_xfer *xfer)
td = xfer->td_transfer_first;
OHCI_APPEND_QH(ed, td->itd_self, sc->sc_isoc_p_last);
- return;
}
static void
@@ -2057,7 +2024,6 @@ ohci_device_isoc_start(struct usb2_xfer *xfer)
{
/* put transfer on interrupt queue */
ohci_transfer_intr_enqueue(xfer);
- return;
}
struct usb2_pipe_methods ohci_device_isoc_methods =
@@ -2092,7 +2058,6 @@ ohci_root_ctrl_close(struct usb2_xfer *xfer)
sc->sc_root_ctrl.xfer = NULL;
}
ohci_device_done(xfer, USB_ERR_CANCELLED);
- return;
}
/* data structures and routines
@@ -2173,8 +2138,6 @@ ohci_root_ctrl_start(struct usb2_xfer *xfer)
usb2_config_td_queue_command
(&sc->sc_config_td, NULL, &ohci_root_ctrl_task, 0, 0);
-
- return;
}
static void
@@ -2182,7 +2145,6 @@ ohci_root_ctrl_task(struct ohci_softc *sc,
struct ohci_config_copy *cc, uint16_t refcount)
{
ohci_root_ctrl_poll(sc);
- return;
}
static void
@@ -2493,7 +2455,6 @@ ohci_root_ctrl_poll(struct ohci_softc *sc)
{
usb2_sw_transfer(&sc->sc_root_ctrl,
&ohci_root_ctrl_done);
- return;
}
struct usb2_pipe_methods ohci_root_ctrl_methods =
@@ -2524,7 +2485,6 @@ ohci_root_intr_close(struct usb2_xfer *xfer)
sc->sc_root_intr.xfer = NULL;
}
ohci_device_done(xfer, USB_ERR_CANCELLED);
- return;
}
static void
@@ -2539,7 +2499,6 @@ ohci_root_intr_start(struct usb2_xfer *xfer)
ohci_softc_t *sc = xfer->usb2_sc;
sc->sc_root_intr.xfer = xfer;
- return;
}
struct usb2_pipe_methods ohci_root_intr_methods =
@@ -2719,7 +2678,6 @@ alloc_dma_set:
xfer->flags_int.curr_dma_set = 1;
goto alloc_dma_set;
}
- return;
}
static void
@@ -2772,7 +2730,6 @@ ohci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc,
break;
}
}
- return;
}
static void
@@ -2789,7 +2746,6 @@ ohci_get_dma_delay(struct usb2_bus *bus, uint32_t *pus)
* transfer descriptor(s) and QH
*/
*pus = (1125); /* microseconds */
- return;
}
struct usb2_bus_methods ohci_bus_methods =
generated by cgit v1.3 (git 2.53.0) at 2026-08-03 05:28:10 +0000