usb: Remove unused devclass arguments to DRIVER_MODULE.

89 files changed, 103 insertions, 287 deletions

diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c
index d4422caf0fcd..9847afb952eb 100644
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3.c
@@ -347,6 +347,5 @@ static driver_t snps_dwc3_driver = {
 	sizeof(struct snps_dwc3_softc)
 };
 
-static devclass_t snps_dwc3_devclass;
-DRIVER_MODULE(snps_dwc3, simplebus, snps_dwc3_driver, snps_dwc3_devclass, 0, 0);
+DRIVER_MODULE(snps_dwc3, simplebus, snps_dwc3_driver, 0, 0);
 MODULE_DEPEND(snps_dwc3, xhci, 1, 1, 1);
diff --git a/sys/dev/usb/controller/dwc_otg_acpi.c b/sys/dev/usb/controller/dwc_otg_acpi.c
index c6154eabc15a..cd574706c62f 100644
--- a/sys/dev/usb/controller/dwc_otg_acpi.c
+++ b/sys/dev/usb/controller/dwc_otg_acpi.c
@@ -178,7 +178,5 @@ static driver_t dwc_otg_driver = {
 	.size = sizeof(struct dwc_otg_softc),
 };
 
-static devclass_t dwc_otg_devclass;
-
-DRIVER_MODULE(dwcotg, acpi, dwc_otg_driver, dwc_otg_devclass, 0, 0);
+DRIVER_MODULE(dwcotg, acpi, dwc_otg_driver, 0, 0);
 MODULE_DEPEND(dwcotg, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/dwc_otg_fdt.c b/sys/dev/usb/controller/dwc_otg_fdt.c
index de47a543680b..cd6a28264079 100644
--- a/sys/dev/usb/controller/dwc_otg_fdt.c
+++ b/sys/dev/usb/controller/dwc_otg_fdt.c
@@ -214,7 +214,5 @@ driver_t dwc_otg_driver = {
 	.size = sizeof(struct dwc_otg_fdt_softc),
 };
 
-static devclass_t dwc_otg_devclass;
-
-DRIVER_MODULE(dwcotg, simplebus, dwc_otg_driver, dwc_otg_devclass, 0, 0);
+DRIVER_MODULE(dwcotg, simplebus, dwc_otg_driver, 0, 0);
 MODULE_DEPEND(dwcotg, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/dwc_otg_hisi.c b/sys/dev/usb/controller/dwc_otg_hisi.c
index 2adaa71cfb3b..eb7c3074729f 100644
--- a/sys/dev/usb/controller/dwc_otg_hisi.c
+++ b/sys/dev/usb/controller/dwc_otg_hisi.c
@@ -88,10 +88,7 @@ static device_method_t hisi_dwc_otg_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t hisi_dwc_otg_devclass;
-
 DEFINE_CLASS_1(hisi_dwcotg, hisi_dwc_otg_driver, hisi_dwc_otg_methods,
     sizeof(struct dwc_otg_fdt_softc), dwc_otg_driver);
-DRIVER_MODULE(hisi_dwcotg, simplebus, hisi_dwc_otg_driver,
-    hisi_dwc_otg_devclass, 0, 0);
+DRIVER_MODULE(hisi_dwcotg, simplebus, hisi_dwc_otg_driver, 0, 0);
 MODULE_DEPEND(hisi_dwcotg, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c
index 01f758837d75..1e44c5d07655 100644
--- a/sys/dev/usb/controller/ehci_fsl.c
+++ b/sys/dev/usb/controller/ehci_fsl.c
@@ -93,9 +93,7 @@ static driver_t ehci_driver = {
 	sizeof(struct ehci_softc)
 };
 
-static devclass_t ehci_devclass;
-
-DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(ehci, simplebus, ehci_driver, 0, 0);
 MODULE_DEPEND(ehci, usb, 1, 1, 1);
 
 /*
diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c
index a93b187f84cd..b89fefb44be6 100644
--- a/sys/dev/usb/controller/ehci_imx.c
+++ b/sys/dev/usb/controller/ehci_imx.c
@@ -241,15 +241,13 @@ static driver_t imx_usbmisc_driver = {
 	sizeof(struct imx_usbmisc_softc)
 };
 
-static devclass_t imx_usbmisc_devclass;
-
 /*
  * This driver needs to start before the ehci driver, but later than the usual
  * "special" drivers like clocks and cpu.  Ehci starts at DEFAULT so
  * DEFAULT-1000 seems good.
  */
 EARLY_DRIVER_MODULE(imx_usbmisc, simplebus, imx_usbmisc_driver,
-    imx_usbmisc_devclass, 0, 0, BUS_PASS_DEFAULT - 1000);
+    0, 0, BUS_PASS_DEFAULT - 1000);
 
 /*-----------------------------------------------------------------------------
  * imx_ehci driver...
@@ -507,7 +505,5 @@ static driver_t ehci_driver = {
 	sizeof(struct imx_ehci_softc)
 };
 
-static devclass_t ehci_devclass;
-
-DRIVER_MODULE(imx_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(imx_ehci, simplebus, ehci_driver, 0, 0);
 MODULE_DEPEND(imx_ehci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/ehci_msm.c b/sys/dev/usb/controller/ehci_msm.c
index 1920f9c3854b..015c8a99d5e3 100644
--- a/sys/dev/usb/controller/ehci_msm.c
+++ b/sys/dev/usb/controller/ehci_msm.c
@@ -224,7 +224,5 @@ static driver_t ehci_driver = {
 	.size = sizeof(ehci_softc_t),
 };
 
-static devclass_t ehci_devclass;
-
-DRIVER_MODULE(ehci_msm, simplebus, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(ehci_msm, simplebus, ehci_driver, 0, 0);
 MODULE_DEPEND(ehci_msm, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c
index b0687bd62467..802310887043 100644
--- a/sys/dev/usb/controller/ehci_mv.c
+++ b/sys/dev/usb/controller/ehci_mv.c
@@ -381,7 +381,5 @@ static driver_t ehci_driver = {
 	sizeof(ehci_softc_t),
 };
 
-static devclass_t ehci_devclass;
-
-DRIVER_MODULE(ehci_mv, simplebus, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(ehci_mv, simplebus, ehci_driver, 0, 0);
 MODULE_DEPEND(ehci_mv, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c
index dbc2def5b8d2..ae285375228f 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -593,7 +593,5 @@ static driver_t ehci_driver = {
 	.size = sizeof(struct ehci_softc),
 };
 
-static devclass_t ehci_devclass;
-
-DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(ehci, pci, ehci_driver, 0, 0);
 MODULE_DEPEND(ehci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/generic_ehci_acpi.c b/sys/dev/usb/controller/generic_ehci_acpi.c
index 2f59728140bf..105502dc6e50 100644
--- a/sys/dev/usb/controller/generic_ehci_acpi.c
+++ b/sys/dev/usb/controller/generic_ehci_acpi.c
@@ -80,7 +80,5 @@ static device_method_t ehci_acpi_methods[] = {
 DEFINE_CLASS_1(ehci, ehci_acpi_driver, ehci_acpi_methods,
     sizeof(ehci_softc_t), generic_ehci_driver);
 
-static devclass_t ehci_acpi_devclass;
-
-DRIVER_MODULE(ehci, acpi, ehci_acpi_driver, ehci_acpi_devclass, 0, 0);
+DRIVER_MODULE(ehci, acpi, ehci_acpi_driver, 0, 0);
 MODULE_DEPEND(ehci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c
index a660674cbace..0d856a48de79 100644
--- a/sys/dev/usb/controller/generic_ehci_fdt.c
+++ b/sys/dev/usb/controller/generic_ehci_fdt.c
@@ -237,7 +237,5 @@ static device_method_t ehci_fdt_methods[] = {
 DEFINE_CLASS_1(ehci, ehci_fdt_driver, ehci_fdt_methods,
     sizeof(ehci_softc_t), generic_ehci_driver);
 
-static devclass_t ehci_fdt_devclass;
-
-DRIVER_MODULE(generic_ehci, simplebus, ehci_fdt_driver, ehci_fdt_devclass, 0, 0);
+DRIVER_MODULE(generic_ehci, simplebus, ehci_fdt_driver, 0, 0);
 MODULE_DEPEND(generic_ehci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c
index 8dd9bc50abc7..6260736d7cc3 100644
--- a/sys/dev/usb/controller/generic_ohci.c
+++ b/sys/dev/usb/controller/generic_ohci.c
@@ -327,8 +327,5 @@ driver_t generic_ohci_driver = {
 	.size = sizeof(struct generic_ohci_softc),
 };
 
-static devclass_t generic_ohci_devclass;
-
-DRIVER_MODULE(ohci, simplebus, generic_ohci_driver,
-    generic_ohci_devclass, 0, 0);
+DRIVER_MODULE(ohci, simplebus, generic_ohci_driver, 0, 0);
 MODULE_DEPEND(ohci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/generic_xhci_acpi.c b/sys/dev/usb/controller/generic_xhci_acpi.c
index 1594fa8c6670..b354c3227b98 100644
--- a/sys/dev/usb/controller/generic_xhci_acpi.c
+++ b/sys/dev/usb/controller/generic_xhci_acpi.c
@@ -77,7 +77,5 @@ static device_method_t xhci_acpi_methods[] = {
 DEFINE_CLASS_1(xhci, xhci_acpi_driver, xhci_acpi_methods,
     sizeof(struct xhci_softc), generic_xhci_driver);
 
-static devclass_t xhci_acpi_devclass;
-
-DRIVER_MODULE(xhci, acpi, xhci_acpi_driver, xhci_acpi_devclass, 0, 0);
+DRIVER_MODULE(xhci, acpi, xhci_acpi_driver, 0, 0);
 MODULE_DEPEND(xhci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c
index ea34c2077e43..bc3d78638cad 100644
--- a/sys/dev/usb/controller/generic_xhci_fdt.c
+++ b/sys/dev/usb/controller/generic_xhci_fdt.c
@@ -124,7 +124,5 @@ static device_method_t xhci_fdt_methods[] = {
 DEFINE_CLASS_1(xhci, xhci_fdt_driver, xhci_fdt_methods,
     sizeof(struct xhci_softc), generic_xhci_driver);
 
-static devclass_t xhci_fdt_devclass;
-
-DRIVER_MODULE(xhci, simplebus, xhci_fdt_driver, xhci_fdt_devclass, 0, 0);
+DRIVER_MODULE(xhci, simplebus, xhci_fdt_driver, 0, 0);
 MODULE_DEPEND(xhci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c
index bd23b23fb036..827cf202df5f 100644
--- a/sys/dev/usb/controller/musb_otg_allwinner.c
+++ b/sys/dev/usb/controller/musb_otg_allwinner.c
@@ -621,7 +621,5 @@ static driver_t awusbdrd_driver = {
 	.size = sizeof(struct awusbdrd_softc),
 };
 
-static devclass_t awusbdrd_devclass;
-
-DRIVER_MODULE(musbotg, simplebus, awusbdrd_driver, awusbdrd_devclass, 0, 0);
+DRIVER_MODULE(musbotg, simplebus, awusbdrd_driver, 0, 0);
 MODULE_DEPEND(musbotg, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c
index 8c3ee521b5b1..b9d90ba5432d 100644
--- a/sys/dev/usb/controller/ohci_pci.c
+++ b/sys/dev/usb/controller/ohci_pci.c
@@ -381,7 +381,5 @@ static driver_t ohci_driver = {
 	.size = sizeof(struct ohci_softc),
 };
 
-static devclass_t ohci_devclass;
-
-DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0);
+DRIVER_MODULE(ohci, pci, ohci_driver, 0, 0);
 MODULE_DEPEND(ohci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c
index c24a34eda283..370be7519109 100644
--- a/sys/dev/usb/controller/uhci_pci.c
+++ b/sys/dev/usb/controller/uhci_pci.c
@@ -456,7 +456,5 @@ static driver_t uhci_driver = {
 	.size = sizeof(struct uhci_softc),
 };
 
-static devclass_t uhci_devclass;
-
-DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0);
+DRIVER_MODULE(uhci, pci, uhci_driver, 0, 0);
 MODULE_DEPEND(uhci, usb, 1, 1, 1);
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index fd9bcd5ee524..0897af0492cb 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -106,8 +106,6 @@ static int usb_no_shutdown_wait = 0;
 SYSCTL_INT(_hw_usb, OID_AUTO, no_shutdown_wait, CTLFLAG_RWTUN,
     &usb_no_shutdown_wait, 0, "No USB device waiting at system shutdown.");
 
-static devclass_t usb_devclass;
-
 static device_method_t usb_methods[] = {
 	DEVMETHOD(device_probe, usb_probe),
 	DEVMETHOD(device_attach, usb_attach),
@@ -126,19 +124,19 @@ static driver_t usb_driver = {
 };
 
 /* Host Only Drivers */
-DRIVER_MODULE(usbus, ohci, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, uhci, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, ehci, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, xhci, usb_driver, usb_devclass, 0, 0);
+DRIVER_MODULE(usbus, ohci, usb_driver, 0, 0);
+DRIVER_MODULE(usbus, uhci, usb_driver, 0, 0);
+DRIVER_MODULE(usbus, ehci, usb_driver, 0, 0);
+DRIVER_MODULE(usbus, xhci, usb_driver, 0, 0);
 
 /* Device Only Drivers */
-DRIVER_MODULE(usbus, musbotg, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, uss820dci, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, octusb, usb_driver, usb_devclass, 0, 0);
+DRIVER_MODULE(usbus, musbotg, usb_driver, 0, 0);
+DRIVER_MODULE(usbus, uss820dci, usb_driver, 0, 0);
+DRIVER_MODULE(usbus, octusb, usb_driver, 0, 0);
 
 /* Dual Mode Drivers */
-DRIVER_MODULE(usbus, dwcotg, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, saf1761otg, usb_driver, usb_devclass, 0, 0);
+DRIVER_MODULE(usbus, dwcotg, usb_driver, 0, 0);
+DRIVER_MODULE(usbus, saf1761otg, usb_driver, 0, 0);
 
 /*------------------------------------------------------------------------*
  *	usb_probe
diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c
index b2dece4c1e3d..02db13595f3d 100644
--- a/sys/dev/usb/controller/usb_nop_xceiv.c
+++ b/sys/dev/usb/controller/usb_nop_xceiv.c
@@ -199,8 +199,6 @@ static device_method_t usb_nop_xceiv_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t usb_nop_xceiv_devclass;
-
 static driver_t usb_nop_xceiv_driver = {
 	"usb_nop_xceiv",
 	usb_nop_xceiv_methods,
@@ -208,4 +206,4 @@ static driver_t usb_nop_xceiv_driver = {
 };
 
 EARLY_DRIVER_MODULE(usb_nop_xceiv, simplebus, usb_nop_xceiv_driver,
-    usb_nop_xceiv_devclass, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
+    0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c
index c35cd08b3341..e87489f32d14 100644
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -85,9 +85,7 @@ static device_method_t xhci_device_methods[] = {
 DEFINE_CLASS_0(xhci, xhci_pci_driver, xhci_device_methods,
     sizeof(struct xhci_softc));
 
-static devclass_t xhci_devclass;
-
-DRIVER_MODULE(xhci, pci, xhci_pci_driver, xhci_devclass, NULL, NULL);
+DRIVER_MODULE(xhci, pci, xhci_pci_driver, NULL, NULL);
 MODULE_DEPEND(xhci, usb, 1, 1, 1);
 
 static const char *
diff --git a/sys/dev/usb/gadget/g_audio.c b/sys/dev/usb/gadget/g_audio.c
index 2ab6642cb123..52ce518d9ef9 100644
--- a/sys/dev/usb/gadget/g_audio.c
+++ b/sys/dev/usb/gadget/g_audio.c
@@ -134,8 +134,6 @@ static usb_handle_request_t g_audio_handle_request;
 static usb_callback_t g_audio_isoc_read_callback;
 static usb_callback_t g_audio_isoc_write_callback;
 
-static devclass_t g_audio_devclass;
-
 static void g_audio_watchdog(void *arg);
 static void g_audio_timeout(void *arg);
 
@@ -157,7 +155,7 @@ static driver_t g_audio_driver = {
 	.size = sizeof(struct g_audio_softc),
 };
 
-DRIVER_MODULE(g_audio, uhub, g_audio_driver, g_audio_devclass, 0, 0);
+DRIVER_MODULE(g_audio, uhub, g_audio_driver, 0, 0);
 MODULE_DEPEND(g_audio, usb, 1, 1, 1);
 
 static const struct usb_config g_audio_config[G_AUDIO_N_TRANSFER] = {
diff --git a/sys/dev/usb/gadget/g_keyboard.c b/sys/dev/usb/gadget/g_keyboard.c
index d88e0ea432ce..6660e2bc9acc 100644
--- a/sys/dev/usb/gadget/g_keyboard.c
+++ b/sys/dev/usb/gadget/g_keyboard.c
@@ -133,8 +133,6 @@ static device_detach_t g_keyboard_detach;
 static usb_handle_request_t g_keyboard_handle_request;
 static usb_callback_t g_keyboard_intr_callback;
 
-static devclass_t g_keyboard_devclass;
-
 static device_method_t g_keyboard_methods[] = {
 	/* USB interface */
 	DEVMETHOD(usb_handle_request, g_keyboard_handle_request),
@@ -153,7 +151,7 @@ static driver_t g_keyboard_driver = {
 	.size = sizeof(struct g_keyboard_softc),
 };
 
-DRIVER_MODULE(g_keyboard, uhub, g_keyboard_driver, g_keyboard_devclass, 0, 0);
+DRIVER_MODULE(g_keyboard, uhub, g_keyboard_driver, 0, 0);
 MODULE_DEPEND(g_keyboard, usb, 1, 1, 1);
 
 static const struct usb_config g_keyboard_config[G_KEYBOARD_N_TRANSFER] = {
diff --git a/sys/dev/usb/gadget/g_modem.c b/sys/dev/usb/gadget/g_modem.c
index 02593a9ce5fe..3df9a6ce13a1 100644
--- a/sys/dev/usb/gadget/g_modem.c
+++ b/sys/dev/usb/gadget/g_modem.c
@@ -132,8 +132,6 @@ static usb_callback_t g_modem_bulk_write_callback;
 
 static void g_modem_timeout(void *arg);
 
-static devclass_t g_modem_devclass;
-
 static device_method_t g_modem_methods[] = {
 	/* USB interface */
 	DEVMETHOD(usb_handle_request, g_modem_handle_request),
@@ -152,7 +150,7 @@ static driver_t g_modem_driver = {
 	.size = sizeof(struct g_modem_softc),
 };
 
-DRIVER_MODULE(g_modem, uhub, g_modem_driver, g_modem_devclass, 0, 0);
+DRIVER_MODULE(g_modem, uhub, g_modem_driver, 0, 0);
 MODULE_DEPEND(g_modem, usb, 1, 1, 1);
 
 static const struct usb_config g_modem_config[G_MODEM_N_TRANSFER] = {
diff --git a/sys/dev/usb/gadget/g_mouse.c b/sys/dev/usb/gadget/g_mouse.c
index ce78b5aaa737..87786da28157 100644
--- a/sys/dev/usb/gadget/g_mouse.c
+++ b/sys/dev/usb/gadget/g_mouse.c
@@ -131,8 +131,6 @@ static device_detach_t g_mouse_detach;
 static usb_handle_request_t g_mouse_handle_request;
 static usb_callback_t g_mouse_intr_callback;
 
-static devclass_t g_mouse_devclass;
-
 static device_method_t g_mouse_methods[] = {
 	/* USB interface */
 	DEVMETHOD(usb_handle_request, g_mouse_handle_request),
@@ -151,7 +149,7 @@ static driver_t g_mouse_driver = {
 	.size = sizeof(struct g_mouse_softc),
 };
 
-DRIVER_MODULE(g_mouse, uhub, g_mouse_driver, g_mouse_devclass, 0, 0);
+DRIVER_MODULE(g_mouse, uhub, g_mouse_driver, 0, 0);
 MODULE_DEPEND(g_mouse, usb, 1, 1, 1);
 
 static const struct usb_config g_mouse_config[G_MOUSE_N_TRANSFER] = {
diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c
index b76653cc303b..2f5487835c5e 100644
--- a/sys/dev/usb/input/atp.c
+++ b/sys/dev/usb/input/atp.c
@@ -2615,8 +2615,6 @@ atp_sysctl_scale_factor_handler(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 
-static devclass_t atp_devclass;
-
 static device_method_t atp_methods[] = {
 	DEVMETHOD(device_probe,  atp_probe),
 	DEVMETHOD(device_attach, atp_attach),
@@ -2631,7 +2629,7 @@ static driver_t atp_driver = {
 	.size    = sizeof(struct atp_softc)
 };
 
-DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, NULL, 0);
+DRIVER_MODULE(atp, uhub, atp_driver, NULL, NULL);
 MODULE_DEPEND(atp, usb, 1, 1, 1);
 MODULE_DEPEND(atp, hid, 1, 1, 1);
 MODULE_VERSION(atp, 1);
diff --git a/sys/dev/usb/input/uep.c b/sys/dev/usb/input/uep.c
index 5fece855e650..048d133bac9d 100644
--- a/sys/dev/usb/input/uep.c
+++ b/sys/dev/usb/input/uep.c
@@ -517,8 +517,6 @@ uep_close(struct usb_fifo *fifo, int fflags)
 }
 #endif /* !EVDEV_SUPPORT */
 
-static devclass_t uep_devclass;
-
 static device_method_t uep_methods[] = {
 	DEVMETHOD(device_probe, uep_probe),
        	DEVMETHOD(device_attach, uep_attach),
@@ -532,7 +530,7 @@ static driver_t uep_driver = {
 	.size = sizeof(struct uep_softc),
 };
 
-DRIVER_MODULE(uep, uhub, uep_driver, uep_devclass, NULL, NULL);
+DRIVER_MODULE(uep, uhub, uep_driver, NULL, NULL);
 MODULE_DEPEND(uep, usb, 1, 1, 1);
 #ifdef EVDEV_SUPPORT
 MODULE_DEPEND(uep, evdev, 1, 1, 1);
diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
index d877773625d7..d795e8fa6bbc 100644
--- a/sys/dev/usb/input/uhid.c
+++ b/sys/dev/usb/input/uhid.c
@@ -912,10 +912,6 @@ uhid_detach(device_t dev)
 	return (0);
 }
 
-#ifndef HIDRAW_MAKE_UHID_ALIAS
-static devclass_t uhid_devclass;
-#endif
-
 static device_method_t uhid_methods[] = {
 	DEVMETHOD(device_probe, uhid_probe),
 	DEVMETHOD(device_attach, uhid_attach),
@@ -934,11 +930,7 @@ static driver_t uhid_driver = {
 	.size = sizeof(struct uhid_softc),
 };
 
-#ifdef HIDRAW_MAKE_UHID_ALIAS
 DRIVER_MODULE(uhid, uhub, uhid_driver, NULL, NULL);
-#else
-DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0);
-#endif
 MODULE_DEPEND(uhid, usb, 1, 1, 1);
 MODULE_DEPEND(uhid, hid, 1, 1, 1);
 MODULE_VERSION(uhid, 1);
diff --git a/sys/dev/usb/input/uhid_snes.c b/sys/dev/usb/input/uhid_snes.c
index d786b0e1f257..d6642752be8b 100644
--- a/sys/dev/usb/input/uhid_snes.c
+++ b/sys/dev/usb/input/uhid_snes.c
@@ -638,8 +638,6 @@ static driver_t uhid_snes_driver = {
 	sizeof(struct uhid_snes_softc)
 };
 
-static devclass_t uhid_snes_devclass;
-
-DRIVER_MODULE(uhid_snes, uhub, uhid_snes_driver, uhid_snes_devclass, NULL, 0);
+DRIVER_MODULE(uhid_snes, uhub, uhid_snes_driver, NULL, NULL);
 MODULE_DEPEND(uhid_snes, usb, 1, 1, 1);
 USB_PNP_HOST_INFO(snes_devs);
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index f2ff476150ff..4353888505da 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -2173,8 +2173,6 @@ ukbd_driver_load(module_t mod, int what, void *arg)
 	return (0);
 }
 
-static devclass_t ukbd_devclass;
-
 static device_method_t ukbd_methods[] = {
 	DEVMETHOD(device_probe, ukbd_probe),
 	DEVMETHOD(device_attach, ukbd_attach),
@@ -2190,7 +2188,7 @@ static driver_t ukbd_driver = {
 	.size = sizeof(struct ukbd_softc),
 };
 
-DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
+DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_driver_load, NULL);
 MODULE_DEPEND(ukbd, usb, 1, 1, 1);
 MODULE_DEPEND(ukbd, hid, 1, 1, 1);
 #ifdef EVDEV_SUPPORT
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index cce1831287e4..5b3ac2af4cd0 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -1200,8 +1200,6 @@ ums_sysctl_handler_parseinfo(SYSCTL_HANDLER_ARGS)
 	return (err);
 }
 
-static devclass_t ums_devclass;
-
 static device_method_t ums_methods[] = {
 	DEVMETHOD(device_probe, ums_probe),
 	DEVMETHOD(device_attach, ums_attach),
@@ -1216,7 +1214,7 @@ static driver_t ums_driver = {
 	.size = sizeof(struct ums_softc),
 };
 
-DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0);
+DRIVER_MODULE(ums, uhub, ums_driver, NULL, NULL);
 MODULE_DEPEND(ums, usb, 1, 1, 1);
 MODULE_DEPEND(ums, hid, 1, 1, 1);
 #ifdef EVDEV_SUPPORT
diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c
index 3b7886f0fada..fe53f11b8f40 100644
--- a/sys/dev/usb/input/usbhid.c
+++ b/sys/dev/usb/input/usbhid.c
@@ -860,8 +860,6 @@ usbhid_detach(device_t dev)
 	return (0);
 }
 
-static devclass_t usbhid_devclass;
-
 static device_method_t usbhid_methods[] = {
 	DEVMETHOD(device_probe,		usbhid_probe),
 	DEVMETHOD(device_attach,	usbhid_attach),
@@ -892,7 +890,7 @@ static driver_t usbhid_driver = {
 	.size = sizeof(struct usbhid_softc),
 };
 
-DRIVER_MODULE(usbhid, uhub, usbhid_driver, usbhid_devclass, NULL, 0);
+DRIVER_MODULE(usbhid, uhub, usbhid_driver, NULL, NULL);
 MODULE_DEPEND(usbhid, usb, 1, 1, 1);
 MODULE_DEPEND(usbhid, hid, 1, 1, 1);
 MODULE_DEPEND(usbhid, hidbus, 1, 1, 1);
diff --git a/sys/dev/usb/input/wmt.c b/sys/dev/usb/input/wmt.c
index 661fa622433f..5fedd846d258 100644
--- a/sys/dev/usb/input/wmt.c
+++ b/sys/dev/usb/input/wmt.c
@@ -1001,8 +1001,6 @@ static const STRUCT_USB_HOST_ID wmt_devs[] = {
 	 USB_IFACE_SUBCLASS(0),},
 };
 
-static devclass_t wmt_devclass;
-
 static device_method_t wmt_methods[] = {
 	DEVMETHOD(device_probe, wmt_probe),
 	DEVMETHOD(device_attach, wmt_attach),
@@ -1017,7 +1015,7 @@ static driver_t wmt_driver = {
 	.size = sizeof(struct wmt_softc),
 };
 
-DRIVER_MODULE(wmt, uhub, wmt_driver, wmt_devclass, NULL, 0);
+DRIVER_MODULE(wmt, uhub, wmt_driver, NULL, NULL);
 MODULE_DEPEND(wmt, usb, 1, 1, 1);
 MODULE_DEPEND(wmt, hid, 1, 1, 1);
 MODULE_DEPEND(wmt, evdev, 1, 1, 1);
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index c2da3df598c5..c0ca9f192c45 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -1566,9 +1566,7 @@ static driver_t wsp_driver = {
 	.size = sizeof(struct wsp_softc)
 };
 
-static devclass_t wsp_devclass;
-
-DRIVER_MODULE(wsp, uhub, wsp_driver, wsp_devclass, NULL, 0);
+DRIVER_MODULE(wsp, uhub, wsp_driver, NULL, NULL);
 MODULE_DEPEND(wsp, usb, 1, 1, 1);
 MODULE_DEPEND(wsp, hid, 1, 1, 1);
 #ifdef EVDEV_SUPPORT
diff --git a/sys/dev/usb/misc/cp2112.c b/sys/dev/usb/misc/cp2112.c
index edc5a2499660..4a795bf89fc8 100644
--- a/sys/dev/usb/misc/cp2112.c
+++ b/sys/dev/usb/misc/cp2112.c
@@ -1388,9 +1388,7 @@ static driver_t cp2112hid_driver = {
 	.size = sizeof(struct cp2112_softc),
 };
 
-static devclass_t cp2112hid_devclass;
-DRIVER_MODULE(cp2112hid, uhub, cp2112hid_driver, cp2112hid_devclass,
-    NULL, NULL);
+DRIVER_MODULE(cp2112hid, uhub, cp2112hid_driver, NULL, NULL);
 MODULE_DEPEND(cp2112hid, usb, 1, 1, 1);
 MODULE_VERSION(cp2112hid, 1);
 USB_PNP_HOST_INFO(cp2112_devs);
@@ -1421,9 +1419,7 @@ static driver_t cp2112gpio_driver = {
 	.size = sizeof(struct cp2112gpio_softc),
 };
 
-static devclass_t cp2112gpio_devclass;
-DRIVER_MODULE(cp2112gpio, cp2112hid, cp2112gpio_driver, cp2112gpio_devclass,
-    NULL, NULL);
+DRIVER_MODULE(cp2112gpio, cp2112hid, cp2112gpio_driver, NULL, NULL);
 MODULE_DEPEND(cp2112gpio, cp2112hid, 1, 1, 1);
 MODULE_DEPEND(cp2112gpio, gpiobus, 1, 1, 1);
 MODULE_VERSION(cp2112gpio, 1);
@@ -1448,9 +1444,7 @@ static driver_t cp2112iic_driver = {
 	sizeof(struct cp2112iic_softc)
 };
 
-static devclass_t cp2112iic_devclass;
-DRIVER_MODULE(cp2112iic, cp2112hid, cp2112iic_driver, cp2112iic_devclass,
-    NULL, NULL);
+DRIVER_MODULE(cp2112iic, cp2112hid, cp2112iic_driver, NULL, NULL);
 MODULE_DEPEND(cp2112iic, cp2112hid, 1, 1, 1);
 MODULE_DEPEND(cp2112iic, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
 MODULE_VERSION(cp2112iic, 1);
diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c
index 8d987dee00c8..95c2b6fb5141 100644
--- a/sys/dev/usb/misc/udbp.c
+++ b/sys/dev/usb/misc/udbp.c
@@ -241,8 +241,6 @@ static const struct usb_config udbp_config[UDBP_T_MAX] = {
 	},
 };
 
-static devclass_t udbp_devclass;
-
 static device_method_t udbp_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe, udbp_probe),
@@ -269,7 +267,7 @@ static const STRUCT_USB_HOST_ID udbp_devs[] = {
 	{USB_VPI(USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL620USB, 0)},
 };
 
-DRIVER_MODULE(udbp, uhub, udbp_driver, udbp_devclass, udbp_modload, 0);
+DRIVER_MODULE(udbp, uhub, udbp_driver, udbp_modload, NULL);
 MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);
 MODULE_DEPEND(udbp, usb, 1, 1, 1);
 MODULE_VERSION(udbp, 1);
diff --git a/sys/dev/usb/misc/ugold.c b/sys/dev/usb/misc/ugold.c
index 0057d042006d..8316b2924020 100644
--- a/sys/dev/usb/misc/ugold.c
+++ b/sys/dev/usb/misc/ugold.c
@@ -122,8 +122,6 @@ static usb_proc_callback_t ugold_readout_msg;
 
 static usb_callback_t ugold_intr_callback;
 
-static devclass_t ugold_devclass;
-
 static device_method_t ugold_methods[] = {
 	DEVMETHOD(device_probe, ugold_probe),
 	DEVMETHOD(device_attach, ugold_attach),
@@ -142,7 +140,7 @@ static const STRUCT_USB_HOST_ID ugold_devs[] = {
 	{USB_VPI(USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TEMPER, 0)},
 };
 
-DRIVER_MODULE(ugold, uhub, ugold_driver, ugold_devclass, NULL, NULL);
+DRIVER_MODULE(ugold, uhub, ugold_driver, NULL, NULL);
 MODULE_DEPEND(ugold, usb, 1, 1, 1);
 MODULE_DEPEND(ugold, hid, 1, 1, 1);
 MODULE_VERSION(ugold, 1);
diff --git a/sys/dev/usb/misc/uled.c b/sys/dev/usb/misc/uled.c
index 239b251f2deb..e991fbedaa7d 100644
--- a/sys/dev/usb/misc/uled.c
+++ b/sys/dev/usb/misc/uled.c
@@ -97,8 +97,6 @@ static usb_error_t	uled_ctrl_msg(struct uled_softc *, uint8_t, uint8_t,
 			    uint16_t, uint16_t, void *, uint16_t);
 static int		uled_enable(struct uled_softc *);
 
-static devclass_t uled_devclass;
-
 static device_method_t uled_methods[] = {
 	DEVMETHOD(device_probe,		uled_probe),
 	DEVMETHOD(device_attach,	uled_attach),
@@ -120,7 +118,7 @@ static const STRUCT_USB_HOST_ID uled_devs[] = {
 #undef ULED_DEV
 };
 
-DRIVER_MODULE(uled, uhub, uled_driver, uled_devclass, NULL, NULL);
+DRIVER_MODULE(uled, uhub, uled_driver, NULL, NULL);
 MODULE_DEPEND(uled, usb, 1, 1, 1);
 MODULE_VERSION(uled, 1);
 USB_PNP_HOST_INFO(uled_devs);
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index 542bcad44749..3e4251cf1562 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -278,9 +278,7 @@ static driver_t aue_driver = {
 	.size = sizeof(struct aue_softc)
 };
 
-static devclass_t aue_devclass;
-
-DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, NULL, 0);
+DRIVER_MODULE(aue, uhub, aue_driver, NULL, NULL);
 DRIVER_MODULE(miibus, aue, miibus_driver, 0, 0);
 MODULE_DEPEND(aue, uether, 1, 1, 1);
 MODULE_DEPEND(aue, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index 3eb2fec2d448..cd4e27b99a56 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -274,9 +274,7 @@ static driver_t axe_driver = {
 	.size = sizeof(struct axe_softc),
 };
 
-static devclass_t axe_devclass;
-
-DRIVER_MODULE(axe, uhub, axe_driver, axe_devclass, NULL, 0);
+DRIVER_MODULE(axe, uhub, axe_driver, NULL, NULL);
 DRIVER_MODULE(miibus, axe, miibus_driver, 0, 0);
 MODULE_DEPEND(axe, uether, 1, 1, 1);
 MODULE_DEPEND(axe, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index 219326b66ba4..ae0e7c553f79 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -191,9 +191,7 @@ static driver_t axge_driver = {
 	.size = sizeof(struct axge_softc),
 };
 
-static devclass_t axge_devclass;
-
-DRIVER_MODULE(axge, uhub, axge_driver, axge_devclass, NULL, NULL);
+DRIVER_MODULE(axge, uhub, axge_driver, NULL, NULL);
 DRIVER_MODULE(miibus, axge, miibus_driver, NULL, NULL);
 MODULE_DEPEND(axge, uether, 1, 1, 1);
 MODULE_DEPEND(axge, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index b5fa4944974c..551ba5d7fefa 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -259,7 +259,6 @@ static driver_t cdce_driver = {
 	.size = sizeof(struct cdce_softc),
 };
 
-static devclass_t cdce_devclass;
 static eventhandler_tag cdce_etag;
 
 static int  cdce_driver_loaded(struct module *, int, void *);
@@ -303,7 +302,7 @@ static const STRUCT_USB_DUAL_ID cdce_dual_devs[] = {
 	{USB_IF_CSI(UICLASS_CDC, UISUBCLASS_NETWORK_CONTROL_MODEL, 0)},
 };
 
-DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, cdce_driver_loaded, 0);
+DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_driver_loaded, NULL);
 MODULE_VERSION(cdce, 1);
 MODULE_DEPEND(cdce, uether, 1, 1, 1);
 MODULE_DEPEND(cdce, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_cdceem.c b/sys/dev/usb/net/if_cdceem.c
index 7c56a3482402..c539a78792e5 100644
--- a/sys/dev/usb/net/if_cdceem.c
+++ b/sys/dev/usb/net/if_cdceem.c
@@ -210,15 +210,13 @@ static driver_t cdceem_driver = {
 	.size = sizeof(struct cdceem_softc),
 };
 
-static devclass_t cdceem_devclass;
-
 static const STRUCT_USB_DUAL_ID cdceem_dual_devs[] = {
 	{USB_IFACE_CLASS(UICLASS_CDC),
 		USB_IFACE_SUBCLASS(UISUBCLASS_ETHERNET_EMULATION_MODEL),
 		0},
 };
 
-DRIVER_MODULE(cdceem, uhub, cdceem_driver, cdceem_devclass, NULL, NULL);
+DRIVER_MODULE(cdceem, uhub, cdceem_driver, NULL, NULL);
 MODULE_VERSION(cdceem, 1);
 MODULE_DEPEND(cdceem, uether, 1, 1, 1);
 MODULE_DEPEND(cdceem, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index 2a1e4b88c19a..a5c0a988e1cf 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -172,9 +172,7 @@ static driver_t cue_driver = {
 	.size = sizeof(struct cue_softc),
 };
 
-static devclass_t cue_devclass;
-
-DRIVER_MODULE(cue, uhub, cue_driver, cue_devclass, NULL, 0);
+DRIVER_MODULE(cue, uhub, cue_driver, NULL, NULL);
 MODULE_DEPEND(cue, uether, 1, 1, 1);
 MODULE_DEPEND(cue, usb, 1, 1, 1);
 MODULE_DEPEND(cue, ether, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c
index f43c39154662..7bb881b80e51 100644
--- a/sys/dev/usb/net/if_ipheth.c
+++ b/sys/dev/usb/net/if_ipheth.c
@@ -131,8 +131,6 @@ static driver_t ipheth_driver = {
 	.size = sizeof(struct ipheth_softc),
 };
 
-static devclass_t ipheth_devclass;
-
 static const STRUCT_USB_HOST_ID ipheth_devs[] = {
 #if 0
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
@@ -162,7 +160,7 @@ static const STRUCT_USB_HOST_ID ipheth_devs[] = {
 #endif
 };
 
-DRIVER_MODULE(ipheth, uhub, ipheth_driver, ipheth_devclass, NULL, 0);
+DRIVER_MODULE(ipheth, uhub, ipheth_driver, NULL, NULL);
 MODULE_VERSION(ipheth, 1);
 MODULE_DEPEND(ipheth, uether, 1, 1, 1);
 MODULE_DEPEND(ipheth, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index 21719e486d14..5b4f9b1fe4c4 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -214,9 +214,7 @@ static driver_t kue_driver = {
 	.size = sizeof(struct kue_softc),
 };
 
-static devclass_t kue_devclass;
-
-DRIVER_MODULE(kue, uhub, kue_driver, kue_devclass, NULL, 0);
+DRIVER_MODULE(kue, uhub, kue_driver, NULL, NULL);
 MODULE_DEPEND(kue, uether, 1, 1, 1);
 MODULE_DEPEND(kue, usb, 1, 1, 1);
 MODULE_DEPEND(kue, ether, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index 14f1be4157b3..f8c1a9a9b4e2 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -245,9 +245,7 @@ static driver_t mos_driver = {
 	.size = sizeof(struct mos_softc)
 };
 
-static devclass_t mos_devclass;
-
-DRIVER_MODULE(mos, uhub, mos_driver, mos_devclass, NULL, 0);
+DRIVER_MODULE(mos, uhub, mos_driver, NULL, NULL);
 DRIVER_MODULE(miibus, mos, miibus_driver, 0, 0);
 MODULE_DEPEND(mos, uether, 1, 1, 1);
 MODULE_DEPEND(mos, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c
index 006dcf29b1b9..88897dac8f50 100644
--- a/sys/dev/usb/net/if_muge.c
+++ b/sys/dev/usb/net/if_muge.c
@@ -2264,9 +2264,7 @@ static driver_t muge_driver = {
 	.size = sizeof(struct muge_softc),
 };
 
-static devclass_t muge_devclass;
-
-DRIVER_MODULE(muge, uhub, muge_driver, muge_devclass, NULL, NULL);
+DRIVER_MODULE(muge, uhub, muge_driver, NULL, NULL);
 DRIVER_MODULE(miibus, muge, miibus_driver, NULL, NULL);
 MODULE_DEPEND(muge, uether, 1, 1, 1);
 MODULE_DEPEND(muge, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 59b91c89ed70..3bdef334fa38 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -212,10 +212,7 @@ static driver_t rue_driver = {
 	.size = sizeof(struct rue_softc),
 };
 
-static devclass_t rue_devclass;
-
-DRIVER_MODULE_ORDERED(rue, uhub, rue_driver, rue_devclass, NULL, NULL,
-    SI_ORDER_ANY);
+DRIVER_MODULE_ORDERED(rue, uhub, rue_driver, NULL, NULL, SI_ORDER_ANY);
 DRIVER_MODULE(miibus, rue, miibus_driver, NULL, NULL);
 MODULE_DEPEND(rue, uether, 1, 1, 1);
 MODULE_DEPEND(rue, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index c1a081511b32..f6b0095af4ff 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -1769,9 +1769,7 @@ static driver_t smsc_driver = {
 	.size = sizeof(struct smsc_softc),
 };
 
-static devclass_t smsc_devclass;
-
-DRIVER_MODULE(smsc, uhub, smsc_driver, smsc_devclass, NULL, 0);
+DRIVER_MODULE(smsc, uhub, smsc_driver, NULL, NULL);
 DRIVER_MODULE(miibus, smsc, miibus_driver, 0, 0);
 MODULE_DEPEND(smsc, uether, 1, 1, 1);
 MODULE_DEPEND(smsc, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 98764095dfe2..bc64461b828a 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -170,8 +170,6 @@ static driver_t udav_driver = {
 	.size = sizeof(struct udav_softc),
 };
 
-static devclass_t udav_devclass;
-
 static const STRUCT_USB_HOST_ID udav_devs[] = {
 	/* ShanTou DM9601 USB NIC */
 	{USB_VPI(USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_DM9601, 0)},
@@ -187,7 +185,7 @@ static const STRUCT_USB_HOST_ID udav_devs[] = {
 	    UDAV_FLAG_NO_PHY)},
 };
 
-DRIVER_MODULE(udav, uhub, udav_driver, udav_devclass, NULL, 0);
+DRIVER_MODULE(udav, uhub, udav_driver, NULL, NULL);
 DRIVER_MODULE(miibus, udav, miibus_driver, 0, 0);
 MODULE_DEPEND(udav, uether, 1, 1, 1);
 MODULE_DEPEND(udav, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c
index 187ac9bde396..a4e99cdcfd43 100644
--- a/sys/dev/usb/net/if_ure.c
+++ b/sys/dev/usb/net/if_ure.c
@@ -189,9 +189,7 @@ static driver_t ure_driver = {
 	.size = sizeof(struct ure_softc),
 };
 
-static devclass_t ure_devclass;
-
-DRIVER_MODULE(ure, uhub, ure_driver, ure_devclass, NULL, NULL);
+DRIVER_MODULE(ure, uhub, ure_driver, NULL, NULL);
 DRIVER_MODULE(miibus, ure, miibus_driver, NULL, NULL);
 MODULE_DEPEND(ure, uether, 1, 1, 1);
 MODULE_DEPEND(ure, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c
index 5d3ecb23815c..4ba44f04f775 100644
--- a/sys/dev/usb/net/if_urndis.c
+++ b/sys/dev/usb/net/if_urndis.c
@@ -161,8 +161,6 @@ static driver_t urndis_driver = {
 	.size = sizeof(struct urndis_softc),
 };
 
-static devclass_t urndis_devclass;
-
 static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
 	/* Generic RNDIS class match */
 	{USB_IFACE_CLASS(UICLASS_CDC),
@@ -184,7 +182,7 @@ static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
 		USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
 };
 
-DRIVER_MODULE(urndis, uhub, urndis_driver, urndis_devclass, NULL, NULL);
+DRIVER_MODULE(urndis, uhub, urndis_driver, NULL, NULL);
 MODULE_VERSION(urndis, 1);
 MODULE_DEPEND(urndis, uether, 1, 1, 1);
 MODULE_DEPEND(urndis, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
index 8c64ad71be4d..6bf5cb723a0d 100644
--- a/sys/dev/usb/net/if_usie.c
+++ b/sys/dev/usb/net/if_usie.c
@@ -209,10 +209,9 @@ static driver_t usie_driver = {
 	.size = sizeof(struct usie_softc),
 };
 
-static devclass_t usie_devclass;
 static eventhandler_tag usie_etag;
 
-DRIVER_MODULE(usie, uhub, usie_driver, usie_devclass, usie_driver_loaded, 0);
+DRIVER_MODULE(usie, uhub, usie_driver, usie_driver_loaded, NULL);
 MODULE_DEPEND(usie, ucom, 1, 1, 1);
 MODULE_DEPEND(usie, usb, 1, 1, 1);
 MODULE_VERSION(usie, 1);
diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c
index 017d07c3c134..62dcf788833b 100644
--- a/sys/dev/usb/net/ruephy.c
+++ b/sys/dev/usb/net/ruephy.c
@@ -66,15 +66,13 @@ static device_method_t ruephy_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ruephy_devclass;
-
 static driver_t ruephy_driver = {
 	.name = "ruephy",
 	.methods = ruephy_methods,
 	.size = sizeof(struct mii_softc)
 };
 
-DRIVER_MODULE(ruephy, miibus, ruephy_driver, ruephy_devclass, 0, 0);
+DRIVER_MODULE(ruephy, miibus, ruephy_driver, 0, 0);
 
 static int ruephy_service(struct mii_softc *, struct mii_data *, int);
 static void ruephy_reset(struct mii_softc *);
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index 4ff5fcc075d3..9c0fad267f16 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -495,8 +495,7 @@ static driver_t uhso_driver = {
 	.size = sizeof(struct uhso_softc)
 };
 
-static devclass_t uhso_devclass;
-DRIVER_MODULE(uhso, uhub, uhso_driver, uhso_devclass, uhso_driver_loaded, 0);
+DRIVER_MODULE(uhso, uhub, uhso_driver, uhso_driver_loaded, NULL);
 MODULE_DEPEND(uhso, ucom, 1, 1, 1);
 MODULE_DEPEND(uhso, usb, 1, 1, 1);
 MODULE_VERSION(uhso, 1);
diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c
index 8125a34b8f91..829ef30a5b79 100644
--- a/sys/dev/usb/serial/u3g.c
+++ b/sys/dev/usb/serial/u3g.c
@@ -188,8 +188,6 @@ static device_method_t u3g_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t u3g_devclass;
-
 static driver_t u3g_driver = {
 	.name = "u3g",
 	.methods = u3g_methods,
@@ -600,7 +598,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
 #undef	U3G_DEV
 };
 
-DRIVER_MODULE(u3g, uhub, u3g_driver, u3g_devclass, u3g_driver_loaded, 0);
+DRIVER_MODULE(u3g, uhub, u3g_driver, u3g_driver_loaded, NULL);
 MODULE_DEPEND(u3g, ucom, 1, 1, 1);
 MODULE_DEPEND(u3g, usb, 1, 1, 1);
 MODULE_VERSION(u3g, 1);
diff --git a/sys/dev/usb/serial/uark.c b/sys/dev/usb/serial/uark.c
index 904977e1ec14..c77047373f5f 100644
--- a/sys/dev/usb/serial/uark.c
+++ b/sys/dev/usb/serial/uark.c
@@ -158,8 +158,6 @@ static device_method_t uark_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uark_devclass;
-
 static driver_t uark_driver = {
 	.name = "uark",
 	.methods = uark_methods,
@@ -170,7 +168,7 @@ static const STRUCT_USB_HOST_ID uark_devs[] = {
 	{USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)},
 };
 
-DRIVER_MODULE(uark, uhub, uark_driver, uark_devclass, NULL, 0);
+DRIVER_MODULE(uark, uhub, uark_driver, NULL, NULL);
 MODULE_DEPEND(uark, ucom, 1, 1, 1);
 MODULE_DEPEND(uark, usb, 1, 1, 1);
 MODULE_VERSION(uark, 1);
diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c
index 10b37984db2f..1553243bae16 100644
--- a/sys/dev/usb/serial/ubsa.c
+++ b/sys/dev/usb/serial/ubsa.c
@@ -263,15 +263,13 @@ static device_method_t ubsa_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ubsa_devclass;
-
 static driver_t ubsa_driver = {
 	.name = "ubsa",
 	.methods = ubsa_methods,
 	.size = sizeof(struct ubsa_softc),
 };
 
-DRIVER_MODULE(ubsa, uhub, ubsa_driver, ubsa_devclass, NULL, 0);
+DRIVER_MODULE(ubsa, uhub, ubsa_driver, NULL, NULL);
 MODULE_DEPEND(ubsa, ucom, 1, 1, 1);
 MODULE_DEPEND(ubsa, usb, 1, 1, 1);
 MODULE_VERSION(ubsa, 1);
diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c
index 2a35756b0a7e..108739fd1b29 100644
--- a/sys/dev/usb/serial/ubser.c
+++ b/sys/dev/usb/serial/ubser.c
@@ -199,15 +199,13 @@ static device_method_t ubser_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ubser_devclass;
-
 static driver_t ubser_driver = {
 	.name = "ubser",
 	.methods = ubser_methods,
 	.size = sizeof(struct ubser_softc),
 };
 
-DRIVER_MODULE(ubser, uhub, ubser_driver, ubser_devclass, NULL, 0);
+DRIVER_MODULE(ubser, uhub, ubser_driver, NULL, NULL);
 MODULE_DEPEND(ubser, ucom, 1, 1, 1);
 MODULE_DEPEND(ubser, usb, 1, 1, 1);
 MODULE_VERSION(ubser, 1);
diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c
index 4abef78c4b2e..744cb3410bae 100644
--- a/sys/dev/usb/serial/uchcom.c
+++ b/sys/dev/usb/serial/uchcom.c
@@ -903,9 +903,7 @@ static driver_t uchcom_driver = {
 	.size = sizeof(struct uchcom_softc)
 };
 
-static devclass_t uchcom_devclass;
-
-DRIVER_MODULE(uchcom, uhub, uchcom_driver, uchcom_devclass, NULL, 0);
+DRIVER_MODULE(uchcom, uhub, uchcom_driver, NULL, NULL);
 MODULE_DEPEND(uchcom, ucom, 1, 1, 1);
 MODULE_DEPEND(uchcom, usb, 1, 1, 1);
 MODULE_VERSION(uchcom, 1);
diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c
index 06ef6480f27c..c583028012af 100644
--- a/sys/dev/usb/serial/ucycom.c
+++ b/sys/dev/usb/serial/ucycom.c
@@ -169,8 +169,6 @@ static device_method_t ucycom_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ucycom_devclass;
-
 static driver_t ucycom_driver = {
 	.name = "ucycom",
 	.methods = ucycom_methods,
@@ -184,7 +182,7 @@ static const STRUCT_USB_HOST_ID ucycom_devs[] = {
 	{USB_VPI(USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, MODEL_CY7C64013)},
 };
 
-DRIVER_MODULE(ucycom, uhub, ucycom_driver, ucycom_devclass, NULL, 0);
+DRIVER_MODULE(ucycom, uhub, ucycom_driver, NULL, NULL);
 MODULE_DEPEND(ucycom, ucom, 1, 1, 1);
 MODULE_DEPEND(ucycom, usb, 1, 1, 1);
 MODULE_DEPEND(ucycom, hid, 1, 1, 1);
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c
index bc3f00a7b473..cdefcaba7a43 100644
--- a/sys/dev/usb/serial/ufoma.c
+++ b/sys/dev/usb/serial/ufoma.c
@@ -308,8 +308,6 @@ static device_method_t ufoma_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ufoma_devclass;
-
 static driver_t ufoma_driver = {
 	.name = "ufoma",
 	.methods = ufoma_methods,
@@ -321,7 +319,7 @@ static const STRUCT_USB_HOST_ID ufoma_devs[] = {
 	 USB_IFACE_SUBCLASS(UISUBCLASS_MCPC),},
 };
 
-DRIVER_MODULE(ufoma, uhub, ufoma_driver, ufoma_devclass, NULL, 0);
+DRIVER_MODULE(ufoma, uhub, ufoma_driver, NULL, NULL);
 MODULE_DEPEND(ufoma, ucom, 1, 1, 1);
 MODULE_DEPEND(ufoma, usb, 1, 1, 1);
 MODULE_VERSION(ufoma, 1);
diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c
index a630fcbac5b5..8678d77f4278 100644
--- a/sys/dev/usb/serial/uftdi.c
+++ b/sys/dev/usb/serial/uftdi.c
@@ -259,8 +259,6 @@ static device_method_t uftdi_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uftdi_devclass;
-
 static driver_t uftdi_driver = {
 	.name = "uftdi",
 	.methods = uftdi_methods,
@@ -915,7 +913,7 @@ static const STRUCT_USB_HOST_ID uftdi_devs[] = {
 #undef UFTDI_DEV
 };
 
-DRIVER_MODULE(uftdi, uhub, uftdi_driver, uftdi_devclass, NULL, NULL);
+DRIVER_MODULE(uftdi, uhub, uftdi_driver, NULL, NULL);
 MODULE_DEPEND(uftdi, ucom, 1, 1, 1);
 MODULE_DEPEND(uftdi, usb, 1, 1, 1);
 MODULE_VERSION(uftdi, 1);
diff --git a/sys/dev/usb/serial/ugensa.c b/sys/dev/usb/serial/ugensa.c
index ba694e4805bd..b159c5586ec9 100644
--- a/sys/dev/usb/serial/ugensa.c
+++ b/sys/dev/usb/serial/ugensa.c
@@ -146,8 +146,6 @@ static device_method_t ugensa_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ugensa_devclass;
-
 static driver_t ugensa_driver = {
 	.name = "ugensa",
 	.methods = ugensa_methods,
@@ -165,7 +163,7 @@ static const STRUCT_USB_HOST_ID ugensa_devs[] = {
 		USB_IFACE_SUBCLASS(0x50), USB_IFACE_PROTOCOL(0x01), USB_DRIVER_INFO(10)},
 };
 
-DRIVER_MODULE(ugensa, uhub, ugensa_driver, ugensa_devclass, NULL, 0);
+DRIVER_MODULE(ugensa, uhub, ugensa_driver, NULL, NULL);
 MODULE_DEPEND(ugensa, ucom, 1, 1, 1);
 MODULE_DEPEND(ugensa, usb, 1, 1, 1);
 MODULE_VERSION(ugensa, 1);
diff --git a/sys/dev/usb/serial/uipaq.c b/sys/dev/usb/serial/uipaq.c
index 33f2ae4c0845..666f7fa48f8b 100644
--- a/sys/dev/usb/serial/uipaq.c
+++ b/sys/dev/usb/serial/uipaq.c
@@ -1077,15 +1077,13 @@ static device_method_t uipaq_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uipaq_devclass;
-
 static driver_t uipaq_driver = {
 	.name = "uipaq",
 	.methods = uipaq_methods,
 	.size = sizeof(struct uipaq_softc),
 };
 
-DRIVER_MODULE(uipaq, uhub, uipaq_driver, uipaq_devclass, NULL, 0);
+DRIVER_MODULE(uipaq, uhub, uipaq_driver, NULL, NULL);
 MODULE_DEPEND(uipaq, ucom, 1, 1, 1);
 MODULE_DEPEND(uipaq, usb, 1, 1, 1);
 MODULE_VERSION(uipaq, 1);
diff --git a/sys/dev/usb/serial/ulpt.c b/sys/dev/usb/serial/ulpt.c
index 935dc992c6c2..346f95eb9ef9 100644
--- a/sys/dev/usb/serial/ulpt.c
+++ b/sys/dev/usb/serial/ulpt.c
@@ -749,8 +749,6 @@ ulpt_watchdog(void *arg)
 	    hz, &ulpt_watchdog, sc);
 }
 
-static devclass_t ulpt_devclass;
-
 static device_method_t ulpt_methods[] = {
 	DEVMETHOD(device_probe, ulpt_probe),
 	DEVMETHOD(device_attach, ulpt_attach),
@@ -764,7 +762,7 @@ static driver_t ulpt_driver = {
 	.size = sizeof(struct ulpt_softc),
 };
 
-DRIVER_MODULE(ulpt, uhub, ulpt_driver, ulpt_devclass, NULL, 0);
+DRIVER_MODULE(ulpt, uhub, ulpt_driver, NULL, NULL);
 MODULE_DEPEND(ulpt, usb, 1, 1, 1);
 MODULE_VERSION(ulpt, 1);
 USB_PNP_HOST_INFO(ulpt_devs);
diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index e3c8f1a764fb..a643aa85fa3d 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -268,15 +268,13 @@ static device_method_t umcs7840_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t umcs7840_devclass;
-
 static driver_t umcs7840_driver = {
 	.name = "umcs7840",
 	.methods = umcs7840_methods,
 	.size = sizeof(struct umcs7840_softc),
 };
 
-DRIVER_MODULE(umcs7840, uhub, umcs7840_driver, umcs7840_devclass, 0, 0);
+DRIVER_MODULE(umcs7840, uhub, umcs7840_driver, 0, 0);
 MODULE_DEPEND(umcs7840, ucom, 1, 1, 1);
 MODULE_DEPEND(umcs7840, usb, 1, 1, 1);
 MODULE_VERSION(umcs7840, UMCS7840_MODVER);
diff --git a/sys/dev/usb/serial/umct.c b/sys/dev/usb/serial/umct.c
index dd452d38a67b..fa338aff438c 100644
--- a/sys/dev/usb/serial/umct.c
+++ b/sys/dev/usb/serial/umct.c
@@ -219,15 +219,13 @@ static device_method_t umct_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t umct_devclass;
-
 static driver_t umct_driver = {
 	.name = "umct",
 	.methods = umct_methods,
 	.size = sizeof(struct umct_softc),
 };
 
-DRIVER_MODULE(umct, uhub, umct_driver, umct_devclass, NULL, 0);
+DRIVER_MODULE(umct, uhub, umct_driver, NULL, NULL);
 MODULE_DEPEND(umct, ucom, 1, 1, 1);
 MODULE_DEPEND(umct, usb, 1, 1, 1);
 MODULE_VERSION(umct, 1);
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index 4fa108e962f2..06f8dff74319 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -303,15 +303,13 @@ static device_method_t umodem_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t umodem_devclass;
-
 static driver_t umodem_driver = {
 	.name = "umodem",
 	.methods = umodem_methods,
 	.size = sizeof(struct umodem_softc),
 };
 
-DRIVER_MODULE(umodem, uhub, umodem_driver, umodem_devclass, NULL, 0);
+DRIVER_MODULE(umodem, uhub, umodem_driver, NULL, NULL);
 MODULE_DEPEND(umodem, ucom, 1, 1, 1);
 MODULE_DEPEND(umodem, usb, 1, 1, 1);
 MODULE_VERSION(umodem, UMODEM_MODVER);
diff --git a/sys/dev/usb/serial/umoscom.c b/sys/dev/usb/serial/umoscom.c
index 724ab7f94092..4997ecc92ff7 100644
--- a/sys/dev/usb/serial/umoscom.c
+++ b/sys/dev/usb/serial/umoscom.c
@@ -270,8 +270,6 @@ static device_method_t umoscom_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t umoscom_devclass;
-
 static driver_t umoscom_driver = {
 	.name = "umoscom",
 	.methods = umoscom_methods,
@@ -282,7 +280,7 @@ static const STRUCT_USB_HOST_ID umoscom_devs[] = {
 	{USB_VPI(USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703, 0)}
 };
 
-DRIVER_MODULE(umoscom, uhub, umoscom_driver, umoscom_devclass, NULL, 0);
+DRIVER_MODULE(umoscom, uhub, umoscom_driver, NULL, NULL);
 MODULE_DEPEND(umoscom, ucom, 1, 1, 1);
 MODULE_DEPEND(umoscom, usb, 1, 1, 1);
 MODULE_VERSION(umoscom, 1);
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c
index 9efac9ff6b7c..f9f60d6d3fd8 100644
--- a/sys/dev/usb/serial/uplcom.c
+++ b/sys/dev/usb/serial/uplcom.c
@@ -337,15 +337,13 @@ static device_method_t uplcom_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uplcom_devclass;
-
 static driver_t uplcom_driver = {
 	.name = "uplcom",
 	.methods = uplcom_methods,
 	.size = sizeof(struct uplcom_softc),
 };
 
-DRIVER_MODULE(uplcom, uhub, uplcom_driver, uplcom_devclass, NULL, 0);
+DRIVER_MODULE(uplcom, uhub, uplcom_driver, NULL, NULL);
 MODULE_DEPEND(uplcom, ucom, 1, 1, 1);
 MODULE_DEPEND(uplcom, usb, 1, 1, 1);
 MODULE_VERSION(uplcom, UPLCOM_MODVER);
diff --git a/sys/dev/usb/serial/uslcom.c b/sys/dev/usb/serial/uslcom.c
index fec18d2a5631..e4367d6781a7 100644
--- a/sys/dev/usb/serial/uslcom.c
+++ b/sys/dev/usb/serial/uslcom.c
@@ -372,15 +372,13 @@ static device_method_t uslcom_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uslcom_devclass;
-
 static driver_t uslcom_driver = {
 	.name = "uslcom",
 	.methods = uslcom_methods,
 	.size = sizeof(struct uslcom_softc),
 };
 
-DRIVER_MODULE(uslcom, uhub, uslcom_driver, uslcom_devclass, NULL, 0);
+DRIVER_MODULE(uslcom, uhub, uslcom_driver, NULL, NULL);
 MODULE_DEPEND(uslcom, ucom, 1, 1, 1);
 MODULE_DEPEND(uslcom, usb, 1, 1, 1);
 MODULE_VERSION(uslcom, 1);
diff --git a/sys/dev/usb/serial/uvisor.c b/sys/dev/usb/serial/uvisor.c
index 48a870d2df39..7c26f49e7f41 100644
--- a/sys/dev/usb/serial/uvisor.c
+++ b/sys/dev/usb/serial/uvisor.c
@@ -245,8 +245,6 @@ static device_method_t uvisor_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uvisor_devclass;
-
 static driver_t uvisor_driver = {
 	.name = "uvisor",
 	.methods = uvisor_methods,
@@ -285,7 +283,7 @@ static const STRUCT_USB_HOST_ID uvisor_devs[] = {
 #undef UVISOR_DEV
 };
 
-DRIVER_MODULE(uvisor, uhub, uvisor_driver, uvisor_devclass, NULL, 0);
+DRIVER_MODULE(uvisor, uhub, uvisor_driver, NULL, NULL);
 MODULE_DEPEND(uvisor, ucom, 1, 1, 1);
 MODULE_DEPEND(uvisor, usb, 1, 1, 1);
 MODULE_VERSION(uvisor, 1);
diff --git a/sys/dev/usb/serial/uvscom.c b/sys/dev/usb/serial/uvscom.c
index 8bb69e4402cf..9006a4d2793c 100644
--- a/sys/dev/usb/serial/uvscom.c
+++ b/sys/dev/usb/serial/uvscom.c
@@ -258,15 +258,13 @@ static device_method_t uvscom_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uvscom_devclass;
-
 static driver_t uvscom_driver = {
 	.name = "uvscom",
 	.methods = uvscom_methods,
 	.size = sizeof(struct uvscom_softc),
 };
 
-DRIVER_MODULE(uvscom, uhub, uvscom_driver, uvscom_devclass, NULL, 0);
+DRIVER_MODULE(uvscom, uhub, uvscom_driver, NULL, NULL);
 MODULE_DEPEND(uvscom, ucom, 1, 1, 1);
 MODULE_DEPEND(uvscom, usb, 1, 1, 1);
 MODULE_VERSION(uvscom, UVSCOM_MODVER);
diff --git a/sys/dev/usb/storage/cfumass.c b/sys/dev/usb/storage/cfumass.c
index 88b5a6156704..e66b576f779e 100644
--- a/sys/dev/usb/storage/cfumass.c
+++ b/sys/dev/usb/storage/cfumass.c
@@ -224,9 +224,7 @@ static driver_t cfumass_driver = {
 	.size = sizeof(struct cfumass_softc),
 };
 
-static devclass_t cfumass_devclass;
-
-DRIVER_MODULE(cfumass, uhub, cfumass_driver, cfumass_devclass, NULL, 0);
+DRIVER_MODULE(cfumass, uhub, cfumass_driver, NULL, NULL);
 MODULE_VERSION(cfumass, 0);
 MODULE_DEPEND(cfumass, usb, 1, 1, 1);
 MODULE_DEPEND(cfumass, usb_template, 1, 1, 1);
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index 674c12186f86..a99b05c6ad6c 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -689,8 +689,6 @@ static const uint8_t fake_inq_data[SHORT_INQUIRY_LENGTH] = {
 #define	UFI_COMMAND_LENGTH	12	/* UFI commands are always 12 bytes */
 #define	ATAPI_COMMAND_LENGTH	12	/* ATAPI commands are always 12 bytes */
 
-static devclass_t umass_devclass;
-
 static device_method_t umass_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe, umass_probe),
@@ -711,7 +709,7 @@ static const STRUCT_USB_HOST_ID __used umass_devs[] = {
 	{USB_IFACE_CLASS(UICLASS_MASS),},
 };
 
-DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, NULL, 0);
+DRIVER_MODULE(umass, uhub, umass_driver, NULL, NULL);
 MODULE_DEPEND(umass, usb, 1, 1, 1);
 MODULE_DEPEND(umass, cam, 1, 1, 1);
 MODULE_VERSION(umass, 1);
diff --git a/sys/dev/usb/storage/urio.c b/sys/dev/usb/storage/urio.c
index 25f1145f54e4..d674d294a833 100644
--- a/sys/dev/usb/storage/urio.c
+++ b/sys/dev/usb/storage/urio.c
@@ -180,8 +180,6 @@ static const struct usb_config urio_config[URIO_T_MAX] = {
 	},
 };
 
-static devclass_t urio_devclass;
-
 static device_method_t urio_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe, urio_probe),
@@ -203,7 +201,7 @@ static const STRUCT_USB_HOST_ID urio_devs[] = {
 	{USB_VPI(USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO800USB, 0)},
 };
 
-DRIVER_MODULE(urio, uhub, urio_driver, urio_devclass, NULL, 0);
+DRIVER_MODULE(urio, uhub, urio_driver, NULL, NULL);
 MODULE_DEPEND(urio, usb, 1, 1, 1);
 MODULE_VERSION(urio, 1);
 USB_PNP_HOST_INFO(urio_devs);
diff --git a/sys/dev/usb/storage/ustorage_fs.c b/sys/dev/usb/storage/ustorage_fs.c
index adcb632bc93c..e0316a07aa5a 100644
--- a/sys/dev/usb/storage/ustorage_fs.c
+++ b/sys/dev/usb/storage/ustorage_fs.c
@@ -266,9 +266,7 @@ static driver_t ustorage_fs_driver = {
 	.size = sizeof(struct ustorage_fs_softc),
 };
 
-static devclass_t ustorage_fs_devclass;
-
-DRIVER_MODULE(ustorage_fs, uhub, ustorage_fs_driver, ustorage_fs_devclass, NULL, 0);
+DRIVER_MODULE(ustorage_fs, uhub, ustorage_fs_driver, NULL, NULL);
 MODULE_VERSION(ustorage_fs, 0);
 MODULE_DEPEND(ustorage_fs, usb, 1, 1, 1);
 
diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c
index 1e5427a8bddd..264c189f6d87 100644
--- a/sys/dev/usb/usb_hub.c
+++ b/sys/dev/usb/usb_hub.c
@@ -157,8 +157,6 @@ static const struct usb_config uhub_config[UHUB_N_TRANSFER] = {
  * driver instance for "hub" connected to "usb"
  * and "hub" connected to "hub"
  */
-static devclass_t uhub_devclass;
-
 static device_method_t uhub_methods[] = {
 	DEVMETHOD(device_probe, uhub_probe),
 	DEVMETHOD(device_attach, uhub_attach),
@@ -180,8 +178,8 @@ driver_t uhub_driver = {
 	.size = sizeof(struct uhub_softc)
 };
 
-DRIVER_MODULE(uhub, usbus, uhub_driver, uhub_devclass, 0, 0);
-DRIVER_MODULE(uhub, uhub, uhub_driver, uhub_devclass, NULL, 0);
+DRIVER_MODULE(uhub, usbus, uhub_driver, 0, 0);
+DRIVER_MODULE(uhub, uhub, uhub_driver, 0, 0);
 MODULE_VERSION(uhub, 1);
 
 static void
diff --git a/sys/dev/usb/usb_hub_acpi.c b/sys/dev/usb/usb_hub_acpi.c
index 5a4e73005400..96f5414d379b 100644
--- a/sys/dev/usb/usb_hub_acpi.c
+++ b/sys/dev/usb/usb_hub_acpi.c
@@ -584,7 +584,6 @@ static device_method_t acpi_uhub_root_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t uhub_devclass;
 extern driver_t uhub_driver;
 static kobj_class_t uhub_baseclasses[] = {&uhub_driver, NULL};
 
@@ -602,8 +601,8 @@ static driver_t acpi_uhub_root_driver = {
 	.baseclasses = uhub_baseclasses,
 };
 
-DRIVER_MODULE(uacpi, uhub, acpi_uhub_driver, uhub_devclass, 0, 0);
-DRIVER_MODULE(uacpi, usbus, acpi_uhub_root_driver, uhub_devclass, 0, 0);
+DRIVER_MODULE(uacpi, uhub, acpi_uhub_driver, 0, 0);
+DRIVER_MODULE(uacpi, usbus, acpi_uhub_root_driver, 0, 0);
 
 MODULE_DEPEND(uacpi, acpi, 1, 1, 1);
 MODULE_DEPEND(uacpi, usb, 1, 1, 1);
diff --git a/sys/dev/usb/video/udl.c b/sys/dev/usb/video/udl.c
index 892e61ae2da0..da0b7a201a5e 100644
--- a/sys/dev/usb/video/udl.c
+++ b/sys/dev/usb/video/udl.c
@@ -133,8 +133,6 @@ static const struct usb_config udl_config[UDL_N_TRANSFER] = {
 /*
  * Driver glue.
  */
-static devclass_t udl_devclass;
-
 static device_method_t udl_methods[] = {
 	DEVMETHOD(device_probe, udl_probe),
 	DEVMETHOD(device_attach, udl_attach),
@@ -149,7 +147,7 @@ static driver_t udl_driver = {
 	.size = sizeof(struct udl_softc),
 };
 
-DRIVER_MODULE(udl, uhub, udl_driver, udl_devclass, NULL, NULL);
+DRIVER_MODULE(udl, uhub, udl_driver, NULL, NULL);
 MODULE_DEPEND(udl, usb, 1, 1, 1);
 MODULE_DEPEND(udl, fbd, 1, 1, 1);
 MODULE_DEPEND(udl, videomode, 1, 1, 1);
diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c
index 747e3532cde4..6913a496301a 100644
--- a/sys/dev/usb/wlan/if_rsu.c
+++ b/sys/dev/usb/wlan/if_rsu.c
@@ -274,9 +274,7 @@ static driver_t rsu_driver = {
 	.size = sizeof(struct rsu_softc)
 };
 
-static devclass_t rsu_devclass;
-
-DRIVER_MODULE(rsu, uhub, rsu_driver, rsu_devclass, NULL, 0);
+DRIVER_MODULE(rsu, uhub, rsu_driver, NULL, NULL);
 MODULE_DEPEND(rsu, wlan, 1, 1, 1);
 MODULE_DEPEND(rsu, usb, 1, 1, 1);
 MODULE_DEPEND(rsu, firmware, 1, 1, 1);
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index 4d97dfb3ec8e..93d5abe6abfb 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -3294,9 +3294,7 @@ static driver_t rum_driver = {
 	.size = sizeof(struct rum_softc),
 };
 
-static devclass_t rum_devclass;
-
-DRIVER_MODULE(rum, uhub, rum_driver, rum_devclass, NULL, 0);
+DRIVER_MODULE(rum, uhub, rum_driver, NULL, NULL);
 MODULE_DEPEND(rum, wlan, 1, 1, 1);
 MODULE_DEPEND(rum, usb, 1, 1, 1);
 MODULE_VERSION(rum, 1);
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c
index 52933a4812dc..07c62ac72f18 100644
--- a/sys/dev/usb/wlan/if_run.c
+++ b/sys/dev/usb/wlan/if_run.c
@@ -6437,9 +6437,7 @@ static driver_t run_driver = {
 	.size = sizeof(struct run_softc)
 };
 
-static devclass_t run_devclass;
-
-DRIVER_MODULE(run, uhub, run_driver, run_devclass, run_driver_loaded, NULL);
+DRIVER_MODULE(run, uhub, run_driver, run_driver_loaded, NULL);
 MODULE_DEPEND(run, wlan, 1, 1, 1);
 MODULE_DEPEND(run, usb, 1, 1, 1);
 MODULE_DEPEND(run, firmware, 1, 1, 1);
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index 4ffdc9a72fad..da55dffa6781 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -2864,14 +2864,14 @@ static device_method_t uath_methods[] = {
 	DEVMETHOD(device_detach, uath_detach),
 	DEVMETHOD_END
 };
+
 static driver_t uath_driver = {
 	.name = "uath",
 	.methods = uath_methods,
 	.size = sizeof(struct uath_softc)
 };
-static devclass_t uath_devclass;
 
-DRIVER_MODULE(uath, uhub, uath_driver, uath_devclass, NULL, 0);
+DRIVER_MODULE(uath, uhub, uath_driver, NULL, NULL);
 MODULE_DEPEND(uath, wlan, 1, 1, 1);
 MODULE_DEPEND(uath, usb, 1, 1, 1);
 MODULE_VERSION(uath, 1);
diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c
index 475f23d4537f..4adbea4fbaaf 100644
--- a/sys/dev/usb/wlan/if_upgt.c
+++ b/sys/dev/usb/wlan/if_upgt.c
@@ -2340,9 +2340,7 @@ static driver_t upgt_driver = {
 	.size = sizeof(struct upgt_softc)
 };
 
-static devclass_t upgt_devclass;
-
-DRIVER_MODULE(if_upgt, uhub, upgt_driver, upgt_devclass, NULL, 0);
+DRIVER_MODULE(if_upgt, uhub, upgt_driver, NULL, NULL);
 MODULE_VERSION(if_upgt, 1);
 MODULE_DEPEND(if_upgt, usb, 1, 1, 1);
 MODULE_DEPEND(if_upgt, wlan, 1, 1, 1);
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index 4a2ed51928a7..25048b9823cf 100644
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -401,9 +401,7 @@ static driver_t ural_driver = {
 	.size = sizeof(struct ural_softc),
 };
 
-static devclass_t ural_devclass;
-
-DRIVER_MODULE(ural, uhub, ural_driver, ural_devclass, NULL, 0);
+DRIVER_MODULE(ural, uhub, ural_driver, NULL, NULL);
 MODULE_DEPEND(ural, usb, 1, 1, 1);
 MODULE_DEPEND(ural, wlan, 1, 1, 1);
 MODULE_VERSION(ural, 1);
diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c
index 164436daa21b..2ade18480b6f 100644
--- a/sys/dev/usb/wlan/if_urtw.c
+++ b/sys/dev/usb/wlan/if_urtw.c
@@ -4419,14 +4419,14 @@ static device_method_t urtw_methods[] = {
 	DEVMETHOD(device_detach, urtw_detach),
 	DEVMETHOD_END
 };
+
 static driver_t urtw_driver = {
 	.name = "urtw",
 	.methods = urtw_methods,
 	.size = sizeof(struct urtw_softc)
 };
-static devclass_t urtw_devclass;
 
-DRIVER_MODULE(urtw, uhub, urtw_driver, urtw_devclass, NULL, 0);
+DRIVER_MODULE(urtw, uhub, urtw_driver, NULL, NULL);
 MODULE_DEPEND(urtw, wlan, 1, 1, 1);
 MODULE_DEPEND(urtw, usb, 1, 1, 1);
 MODULE_VERSION(urtw, 1);
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index 8a6e41bcd27f..2a02e7fae5ee 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -2913,9 +2913,7 @@ static driver_t zyd_driver = {
 	.size = sizeof(struct zyd_softc)
 };
 
-static devclass_t zyd_devclass;
-
-DRIVER_MODULE(zyd, uhub, zyd_driver, zyd_devclass, NULL, 0);
+DRIVER_MODULE(zyd, uhub, zyd_driver, NULL, NULL);
 MODULE_DEPEND(zyd, usb, 1, 1, 1);
 MODULE_DEPEND(zyd, wlan, 1, 1, 1);
 MODULE_VERSION(zyd, 1);