s/usb2_/usb_/ on all typedefs for the USB stack.

17 files changed, 80 insertions, 80 deletions

diff --git a/sys/dev/usb/controller/at91dci.c b/sys/dev/usb/controller/at91dci.c
index e50d8f9..f563399 100644
--- a/sys/dev/usb/controller/at91dci.c
+++ b/sys/dev/usb/controller/at91dci.c
@@ -92,7 +92,7 @@ static at91dci_cmd_t at91dci_setup_rx;
 static at91dci_cmd_t at91dci_data_rx;
 static at91dci_cmd_t at91dci_data_tx;
 static at91dci_cmd_t at91dci_data_tx_sync;
-static void	at91dci_device_done(struct usb_xfer *, usb2_error_t);
+static void	at91dci_device_done(struct usb_xfer *, usb_error_t);
 static void	at91dci_do_poll(struct usb_bus *);
 static void	at91dci_standard_done(struct usb_xfer *);
 static void	at91dci_root_intr(struct at91dci_softc *sc);
@@ -1070,7 +1070,7 @@ at91dci_root_intr(struct at91dci_softc *sc)
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 at91dci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct at91dci_td *td;
@@ -1137,7 +1137,7 @@ at91dci_standard_done_sub(struct usb_xfer *xfer)
 static void
 at91dci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1184,7 +1184,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-at91dci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+at91dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus);
 	uint8_t ep_no;
@@ -1355,7 +1355,7 @@ at91dci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe)
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 at91dci_init(struct at91dci_softc *sc)
 {
 	uint32_t csr_val;
@@ -1745,7 +1745,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, at91dci_langtab);
 USB_MAKE_STRING_DESC(STRING_VENDOR, at91dci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, at91dci_product);
 
-static usb2_error_t
+static usb_error_t
 at91dci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1754,7 +1754,7 @@ at91dci_roothub_exec(struct usb_device *udev,
 	uint16_t len;
 	uint16_t value;
 	uint16_t index;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/at91dci.h b/sys/dev/usb/controller/at91dci.h
index 2d9bdcc..a1603aa 100644
--- a/sys/dev/usb/controller/at91dci.h
+++ b/sys/dev/usb/controller/at91dci.h
@@ -233,7 +233,7 @@ struct at91dci_softc {
 
 /* prototypes */
 
-usb2_error_t at91dci_init(struct at91dci_softc *sc);
+usb_error_t at91dci_init(struct at91dci_softc *sc);
 void	at91dci_uninit(struct at91dci_softc *sc);
 void	at91dci_suspend(struct at91dci_softc *sc);
 void	at91dci_resume(struct at91dci_softc *sc);
diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c
index 5cbd7ba..2735c59 100644
--- a/sys/dev/usb/controller/atmegadci.c
+++ b/sys/dev/usb/controller/atmegadci.c
@@ -82,7 +82,7 @@ static atmegadci_cmd_t atmegadci_setup_rx;
 static atmegadci_cmd_t atmegadci_data_rx;
 static atmegadci_cmd_t atmegadci_data_tx;
 static atmegadci_cmd_t atmegadci_data_tx_sync;
-static void atmegadci_device_done(struct usb_xfer *, usb2_error_t);
+static void atmegadci_device_done(struct usb_xfer *, usb_error_t);
 static void atmegadci_do_poll(struct usb_bus *);
 static void atmegadci_standard_done(struct usb_xfer *);
 static void atmegadci_root_intr(struct atmegadci_softc *sc);
@@ -953,7 +953,7 @@ atmegadci_root_intr(struct atmegadci_softc *sc)
 	    sizeof(sc->sc_hub_idata));
  }
 
-static usb2_error_t
+static usb_error_t
 atmegadci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct atmegadci_td *td;
@@ -1020,7 +1020,7 @@ atmegadci_standard_done_sub(struct usb_xfer *xfer)
 static void
 atmegadci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1067,7 +1067,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-atmegadci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+atmegadci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct atmegadci_softc *sc = ATMEGA_BUS2SC(xfer->xroot->bus);
 	uint8_t ep_no;
@@ -1205,7 +1205,7 @@ atmegadci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe)
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 atmegadci_init(struct atmegadci_softc *sc)
 {
 	uint8_t n;
@@ -1566,7 +1566,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, atmegadci_langtab);
 USB_MAKE_STRING_DESC(STRING_VENDOR, atmegadci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, atmegadci_product);
 
-static usb2_error_t
+static usb_error_t
 atmegadci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1576,7 +1576,7 @@ atmegadci_roothub_exec(struct usb_device *udev,
 	uint16_t value;
 	uint16_t index;
 	uint8_t temp;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/atmegadci.h b/sys/dev/usb/controller/atmegadci.h
index 2e9e9f6..68613af 100644
--- a/sys/dev/usb/controller/atmegadci.h
+++ b/sys/dev/usb/controller/atmegadci.h
@@ -276,7 +276,7 @@ struct atmegadci_softc {
 
 /* prototypes */
 
-usb2_error_t atmegadci_init(struct atmegadci_softc *sc);
+usb_error_t atmegadci_init(struct atmegadci_softc *sc);
 void	atmegadci_uninit(struct atmegadci_softc *sc);
 void	atmegadci_suspend(struct atmegadci_softc *sc);
 void	atmegadci_resume(struct atmegadci_softc *sc);
diff --git a/sys/dev/usb/controller/avr32dci.c b/sys/dev/usb/controller/avr32dci.c
index d54ff6f..2bdf11e 100644
--- a/sys/dev/usb/controller/avr32dci.c
+++ b/sys/dev/usb/controller/avr32dci.c
@@ -82,7 +82,7 @@ static avr32dci_cmd_t avr32dci_setup_rx;
 static avr32dci_cmd_t avr32dci_data_rx;
 static avr32dci_cmd_t avr32dci_data_tx;
 static avr32dci_cmd_t avr32dci_data_tx_sync;
-static void avr32dci_device_done(struct usb_xfer *, usb2_error_t);
+static void avr32dci_device_done(struct usb_xfer *, usb_error_t);
 static void avr32dci_do_poll(struct usb_bus *);
 static void avr32dci_standard_done(struct usb_xfer *);
 static void avr32dci_root_intr(struct avr32dci_softc *sc);
@@ -924,7 +924,7 @@ avr32dci_root_intr(struct avr32dci_softc *sc)
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 avr32dci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct avr32dci_td *td;
@@ -991,7 +991,7 @@ avr32dci_standard_done_sub(struct usb_xfer *xfer)
 static void
 avr32dci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1038,7 +1038,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-avr32dci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+avr32dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct avr32dci_softc *sc = AVR32_BUS2SC(xfer->xroot->bus);
 	uint8_t ep_no;
@@ -1175,7 +1175,7 @@ avr32dci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe)
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 avr32dci_init(struct avr32dci_softc *sc)
 {
 	uint8_t n;
@@ -1500,7 +1500,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, avr32dci_langtab);
 USB_MAKE_STRING_DESC(STRING_VENDOR, avr32dci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, avr32dci_product);
 
-static usb2_error_t
+static usb_error_t
 avr32dci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1510,7 +1510,7 @@ avr32dci_roothub_exec(struct usb_device *udev,
 	uint16_t value;
 	uint16_t index;
 	uint32_t temp;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/avr32dci.h b/sys/dev/usb/controller/avr32dci.h
index 5e2daf5..6672fa7 100644
--- a/sys/dev/usb/controller/avr32dci.h
+++ b/sys/dev/usb/controller/avr32dci.h
@@ -244,7 +244,7 @@ struct avr32dci_softc {
 
 /* prototypes */
 
-usb2_error_t avr32dci_init(struct avr32dci_softc *sc);
+usb_error_t avr32dci_init(struct avr32dci_softc *sc);
 void	avr32dci_uninit(struct avr32dci_softc *sc);
 void	avr32dci_suspend(struct avr32dci_softc *sc);
 void	avr32dci_resume(struct avr32dci_softc *sc);
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c
index 69889e7..e827575 100644
--- a/sys/dev/usb/controller/ehci.c
+++ b/sys/dev/usb/controller/ehci.c
@@ -94,7 +94,7 @@ extern struct usb_pipe_methods ehci_device_isoc_fs_methods;
 extern struct usb_pipe_methods ehci_device_isoc_hs_methods;
 
 static void ehci_do_poll(struct usb_bus *bus);
-static void ehci_device_done(struct usb_xfer *xfer, usb2_error_t error);
+static void ehci_device_done(struct usb_xfer *xfer, usb_error_t error);
 static uint8_t ehci_check_transfer(struct usb_xfer *xfer);
 static void ehci_timeout(void *arg);
 static void ehci_root_intr(ehci_softc_t *sc);
@@ -115,7 +115,7 @@ struct ehci_std_temp {
 };
 
 void
-ehci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
+ehci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(bus);
 	uint32_t i;
@@ -145,7 +145,7 @@ ehci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
 	}
 }
 
-usb2_error_t
+usb_error_t
 ehci_reset(ehci_softc_t *sc)
 {
 	uint32_t hcr;
@@ -181,7 +181,7 @@ ehci_reset(ehci_softc_t *sc)
 	return (USB_ERR_IOERROR);
 }
 
-static usb2_error_t
+static usb_error_t
 ehci_hcreset(ehci_softc_t *sc)
 {
 	uint32_t hcr;
@@ -205,7 +205,7 @@ ehci_hcreset(ehci_softc_t *sc)
 	return ehci_reset(sc);
 }
 
-usb2_error_t
+usb_error_t
 ehci_init(ehci_softc_t *sc)
 {
 	struct usb_page_search buf_res;
@@ -217,7 +217,7 @@ ehci_init(ehci_softc_t *sc)
 	uint16_t x;
 	uint16_t y;
 	uint16_t bit;
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTF("start\n");
 
@@ -1120,7 +1120,7 @@ _ehci_remove_qh(ehci_qh_t *sqh, ehci_qh_t *last)
 	return (last);
 }
 
-static usb2_error_t
+static usb_error_t
 ehci_non_isoc_done_sub(struct usb_xfer *xfer)
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
@@ -1216,7 +1216,7 @@ ehci_non_isoc_done_sub(struct usb_xfer *xfer)
 static void
 ehci_non_isoc_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -2111,7 +2111,7 @@ ehci_isoc_hs_done(ehci_softc_t *sc, struct usb_xfer *xfer)
  * from close and from interrupt
  */
 static void
-ehci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+ehci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct usb_pipe_methods *methods = xfer->pipe->methods;
 	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
@@ -2984,7 +2984,7 @@ ehci_disown(ehci_softc_t *sc, uint16_t index, uint8_t lowspeed)
 	EOWRITE4(sc, port, v | EHCI_PS_PO);
 }
 
-static usb2_error_t
+static usb_error_t
 ehci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2998,7 +2998,7 @@ ehci_roothub_exec(struct usb_device *udev,
 	uint16_t value;
 	uint16_t index;
 	uint8_t l;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h
index f23be4e..0868bc8 100644
--- a/sys/dev/usb/controller/ehci.h
+++ b/sys/dev/usb/controller/ehci.h
@@ -574,10 +574,10 @@ hc16toh(const struct ehci_softc *sc, const uint16_t v)
 }
 #endif
 
-usb2_bus_mem_cb_t ehci_iterate_hw_softc;
+usb_bus_mem_cb_t ehci_iterate_hw_softc;
 
-usb2_error_t ehci_reset(ehci_softc_t *sc);
-usb2_error_t ehci_init(ehci_softc_t *sc);
+usb_error_t ehci_reset(ehci_softc_t *sc);
+usb_error_t ehci_init(ehci_softc_t *sc);
 void	ehci_detach(struct ehci_softc *sc);
 void	ehci_suspend(struct ehci_softc *sc);
 void	ehci_resume(struct ehci_softc *sc);
diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c
index 9001e69..dd3e71e 100644
--- a/sys/dev/usb/controller/musb_otg.c
+++ b/sys/dev/usb/controller/musb_otg.c
@@ -86,7 +86,7 @@ static musbotg_cmd_t musbotg_setup_data_tx;
 static musbotg_cmd_t musbotg_setup_status;
 static musbotg_cmd_t musbotg_data_rx;
 static musbotg_cmd_t musbotg_data_tx;
-static void	musbotg_device_done(struct usb_xfer *, usb2_error_t);
+static void	musbotg_device_done(struct usb_xfer *, usb_error_t);
 static void	musbotg_do_poll(struct usb_bus *);
 static void	musbotg_standard_done(struct usb_xfer *);
 static void	musbotg_interrupt_poll(struct musbotg_softc *);
@@ -1321,7 +1321,7 @@ musbotg_root_intr(struct musbotg_softc *sc)
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 musbotg_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct musbotg_td *td;
@@ -1388,7 +1388,7 @@ musbotg_standard_done_sub(struct usb_xfer *xfer)
 static void
 musbotg_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(12, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1435,7 +1435,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-musbotg_device_done(struct usb_xfer *xfer, usb2_error_t error)
+musbotg_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
@@ -1664,7 +1664,7 @@ musbotg_clear_stall(struct usb_device *udev, struct usb_pipe *pipe)
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 musbotg_init(struct musbotg_softc *sc)
 {
 	struct usb_hw_ep_profile *pf;
@@ -2153,7 +2153,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, musbotg_langtab);
 USB_MAKE_STRING_DESC(STRING_VENDOR, musbotg_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, musbotg_product);
 
-static usb2_error_t
+static usb_error_t
 musbotg_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2162,7 +2162,7 @@ musbotg_roothub_exec(struct usb_device *udev,
 	uint16_t len;
 	uint16_t value;
 	uint16_t index;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/musb_otg.h b/sys/dev/usb/controller/musb_otg.h
index 7bba73f..0e843c9 100644
--- a/sys/dev/usb/controller/musb_otg.h
+++ b/sys/dev/usb/controller/musb_otg.h
@@ -396,7 +396,7 @@ struct musbotg_softc {
 
 /* prototypes */
 
-usb2_error_t musbotg_init(struct musbotg_softc *sc);
+usb_error_t musbotg_init(struct musbotg_softc *sc);
 void	musbotg_uninit(struct musbotg_softc *sc);
 void	musbotg_suspend(struct musbotg_softc *sc);
 void	musbotg_resume(struct musbotg_softc *sc);
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c
index 0377179..225ecb0 100644
--- a/sys/dev/usb/controller/ohci.c
+++ b/sys/dev/usb/controller/ohci.c
@@ -94,7 +94,7 @@ extern struct usb_pipe_methods ohci_device_intr_methods;
 extern struct usb_pipe_methods ohci_device_isoc_methods;
 
 static void ohci_do_poll(struct usb_bus *bus);
-static void ohci_device_done(struct usb_xfer *xfer, usb2_error_t error);
+static void ohci_device_done(struct usb_xfer *xfer, usb_error_t error);
 static void ohci_timeout(void *arg);
 static uint8_t ohci_check_transfer(struct usb_xfer *xfer);
 static void ohci_root_intr(ohci_softc_t *sc);
@@ -120,7 +120,7 @@ ohci_get_hcca(ohci_softc_t *sc)
 }
 
 void
-ohci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
+ohci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
 	struct ohci_softc *sc = OHCI_BUS2SC(bus);
 	uint32_t i;
@@ -143,7 +143,7 @@ ohci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
 	}
 }
 
-static usb2_error_t
+static usb_error_t
 ohci_controller_init(ohci_softc_t *sc)
 {
 	struct usb_page_search buf_res;
@@ -289,7 +289,7 @@ ohci_init_ed(struct usb_page_cache *pc)
 	return (ed);
 }
 
-usb2_error_t
+usb_error_t
 ohci_init(ohci_softc_t *sc)
 {
 	struct usb_page_search buf_res;
@@ -812,7 +812,7 @@ static const char *const
 
 #endif
 
-static usb2_error_t
+static usb_error_t
 ohci_non_isoc_done_sub(struct usb_xfer *xfer)
 {
 	ohci_td_t *td;
@@ -908,7 +908,7 @@ ohci_non_isoc_done_sub(struct usb_xfer *xfer)
 static void
 ohci_non_isoc_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1645,7 +1645,7 @@ ohci_root_intr(ohci_softc_t *sc)
  * from close and from interrupt
  */
 static void
-ohci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+ohci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct usb_pipe_methods *methods = xfer->pipe->methods;
 	ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
@@ -2106,7 +2106,7 @@ struct usb_hub_descriptor ohci_hubd =
 	{0},
 };
 
-static usb2_error_t
+static usb_error_t
 ohci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2119,7 +2119,7 @@ ohci_roothub_exec(struct usb_device *udev,
 	uint16_t value;
 	uint16_t index;
 	uint8_t l;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/ohci.h b/sys/dev/usb/controller/ohci.h
index 3f3537f..eeb49aa 100644
--- a/sys/dev/usb/controller/ohci.h
+++ b/sys/dev/usb/controller/ohci.h
@@ -352,9 +352,9 @@ typedef struct ohci_softc {
 
 } ohci_softc_t;
 
-usb2_bus_mem_cb_t ohci_iterate_hw_softc;
+usb_bus_mem_cb_t ohci_iterate_hw_softc;
 
-usb2_error_t ohci_init(ohci_softc_t *sc);
+usb_error_t ohci_init(ohci_softc_t *sc);
 void	ohci_detach(struct ohci_softc *sc);
 void	ohci_suspend(ohci_softc_t *sc);
 void	ohci_resume(ohci_softc_t *sc);
diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c
index c145588..fe5a161 100644
--- a/sys/dev/usb/controller/uhci.c
+++ b/sys/dev/usb/controller/uhci.c
@@ -134,14 +134,14 @@ extern struct usb_pipe_methods uhci_device_isoc_methods;
 
 static uint8_t	uhci_restart(uhci_softc_t *sc);
 static void	uhci_do_poll(struct usb_bus *);
-static void	uhci_device_done(struct usb_xfer *, usb2_error_t);
+static void	uhci_device_done(struct usb_xfer *, usb_error_t);
 static void	uhci_transfer_intr_enqueue(struct usb_xfer *);
 static void	uhci_timeout(void *);
 static uint8_t	uhci_check_transfer(struct usb_xfer *);
 static void	uhci_root_intr(uhci_softc_t *sc);
 
 void
-uhci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
+uhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
 	struct uhci_softc *sc = UHCI_BUS2SC(bus);
 	uint32_t i;
@@ -424,7 +424,7 @@ uhci_init_td(struct usb_page_cache *pc)
 	return (td);
 }
 
-usb2_error_t
+usb_error_t
 uhci_init(uhci_softc_t *sc)
 {
 	uint16_t bit;
@@ -1089,7 +1089,7 @@ uhci_isoc_done(uhci_softc_t *sc, struct usb_xfer *xfer)
 	xfer->aframes = xfer->nframes;
 }
 
-static usb2_error_t
+static usb_error_t
 uhci_non_isoc_done_sub(struct usb_xfer *xfer)
 {
 	struct usb_page_search res;
@@ -1205,7 +1205,7 @@ uhci_non_isoc_done_sub(struct usb_xfer *xfer)
 static void
 uhci_non_isoc_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1857,7 +1857,7 @@ uhci_setup_standard_chain(struct usb_xfer *xfer)
  */
 
 static void
-uhci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+uhci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct usb_pipe_methods *methods = xfer->pipe->methods;
 	uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
@@ -2392,7 +2392,7 @@ struct usb_hub_descriptor_min uhci_hubd_piix =
  * outstanding "port enable change" and "connection status change"
  * events have been reset.
  */
-static usb2_error_t
+static usb_error_t
 uhci_portreset(uhci_softc_t *sc, uint16_t index)
 {
 	uint16_t port;
@@ -2493,7 +2493,7 @@ done:
 	return (USB_ERR_NORMAL_COMPLETION);
 }
 
-static usb2_error_t
+static usb_error_t
 uhci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2507,7 +2507,7 @@ uhci_roothub_exec(struct usb_device *udev,
 	uint16_t status;
 	uint16_t change;
 	uint16_t len;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/uhci.h b/sys/dev/usb/controller/uhci.h
index ff4a640..f2ea246 100644
--- a/sys/dev/usb/controller/uhci.h
+++ b/sys/dev/usb/controller/uhci.h
@@ -309,9 +309,9 @@ typedef struct uhci_softc {
 	char	sc_vendor[16];		/* vendor string for root hub */
 } uhci_softc_t;
 
-usb2_bus_mem_cb_t uhci_iterate_hw_softc;
+usb_bus_mem_cb_t uhci_iterate_hw_softc;
 
-usb2_error_t uhci_init(uhci_softc_t *sc);
+usb_error_t uhci_init(uhci_softc_t *sc);
 void	uhci_suspend(uhci_softc_t *sc);
 void	uhci_resume(uhci_softc_t *sc);
 void	uhci_reset(uhci_softc_t *sc);
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index d9ee3e7..26590cf 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -289,7 +289,7 @@ usb2_bus_attach(struct usb_proc_msg *pm)
 	struct usb_bus *bus;
 	struct usb_device *child;
 	device_t dev;
-	usb2_error_t err;
+	usb_error_t err;
 	enum usb_dev_speed speed;
 
 	bus = ((struct usb_bus_msg *)pm)->bus;
@@ -496,7 +496,7 @@ usb2_bus_mem_flush_all_cb(struct usb_bus *bus, struct usb_page_cache *pc,
  *------------------------------------------------------------------------*/
 #if USB_HAVE_BUSDMA
 void
-usb2_bus_mem_flush_all(struct usb_bus *bus, usb2_bus_mem_cb_t *cb)
+usb2_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb)
 {
 	if (cb) {
 		cb(bus, &usb2_bus_mem_flush_all_cb);
@@ -530,7 +530,7 @@ usb2_bus_mem_alloc_all_cb(struct usb_bus *bus, struct usb_page_cache *pc,
  *------------------------------------------------------------------------*/
 uint8_t
 usb2_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat,
-    usb2_bus_mem_cb_t *cb)
+    usb_bus_mem_cb_t *cb)
 {
 	bus->alloc_failed = 0;
 
@@ -580,7 +580,7 @@ usb2_bus_mem_free_all_cb(struct usb_bus *bus, struct usb_page_cache *pc,
  *	usb2_bus_mem_free_all - factored out code
  *------------------------------------------------------------------------*/
 void
-usb2_bus_mem_free_all(struct usb_bus *bus, usb2_bus_mem_cb_t *cb)
+usb2_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb)
 {
 #if USB_HAVE_BUSDMA
 	if (cb) {
diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c
index ce99746..bbc5ab6 100644
--- a/sys/dev/usb/controller/uss820dci.c
+++ b/sys/dev/usb/controller/uss820dci.c
@@ -81,7 +81,7 @@ static uss820dci_cmd_t uss820dci_setup_rx;
 static uss820dci_cmd_t uss820dci_data_rx;
 static uss820dci_cmd_t uss820dci_data_tx;
 static uss820dci_cmd_t uss820dci_data_tx_sync;
-static void	uss820dci_device_done(struct usb_xfer *, usb2_error_t);
+static void	uss820dci_device_done(struct usb_xfer *, usb_error_t);
 static void	uss820dci_do_poll(struct usb_bus *);
 static void	uss820dci_standard_done(struct usb_xfer *);
 static void	uss820dci_intr_set(struct usb_xfer *, uint8_t);
@@ -1054,7 +1054,7 @@ uss820dci_root_intr(struct uss820dci_softc *sc)
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 uss820dci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct uss820dci_td *td;
@@ -1121,7 +1121,7 @@ uss820dci_standard_done_sub(struct usb_xfer *xfer)
 static void
 uss820dci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1168,7 +1168,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-uss820dci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+uss820dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
@@ -1298,7 +1298,7 @@ uss820dci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe)
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 uss820dci_init(struct uss820dci_softc *sc)
 {
 	const struct usb_hw_ep_profile *pf;
@@ -1790,7 +1790,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, uss820dci_langtab);
 USB_MAKE_STRING_DESC(STRING_VENDOR, uss820dci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, uss820dci_product);
 
-static usb2_error_t
+static usb_error_t
 uss820dci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1799,7 +1799,7 @@ uss820dci_roothub_exec(struct usb_device *udev,
 	uint16_t len;
 	uint16_t value;
 	uint16_t index;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
diff --git a/sys/dev/usb/controller/uss820dci.h b/sys/dev/usb/controller/uss820dci.h
index 8e51caf..e158c1c 100644
--- a/sys/dev/usb/controller/uss820dci.h
+++ b/sys/dev/usb/controller/uss820dci.h
@@ -347,7 +347,7 @@ struct uss820dci_softc {
 
 /* prototypes */
 
-usb2_error_t uss820dci_init(struct uss820dci_softc *sc);
+usb_error_t uss820dci_init(struct uss820dci_softc *sc);
 void	uss820dci_uninit(struct uss820dci_softc *sc);
 void	uss820dci_suspend(struct uss820dci_softc *sc);
 void	uss820dci_resume(struct uss820dci_softc *sc);