diff --git a/sys/arm/freescale/fsl_ocotp.c b/sys/arm/freescale/fsl_ocotp.c
index ddfeedb5e15a..606c4b54fe61 100644
--- a/sys/arm/freescale/fsl_ocotp.c
+++ b/sys/arm/freescale/fsl_ocotp.c
@@ -200,7 +200,5 @@ static driver_t ocotp_driver = {
 	sizeof(struct ocotp_softc)
 };
 
-static devclass_t ocotp_devclass;
-
-EARLY_DRIVER_MODULE(ocotp, simplebus, ocotp_driver, ocotp_devclass, 0, 0,
+EARLY_DRIVER_MODULE(ocotp, simplebus, ocotp_driver, 0, 0,
     BUS_PASS_CPU + BUS_PASS_ORDER_FIRST);
diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c
index 3db5c982b59a..79fa2dd27669 100644
--- a/sys/arm/freescale/imx/imx51_ccm.c
+++ b/sys/arm/freescale/imx/imx51_ccm.c
@@ -148,10 +148,7 @@ static driver_t imxccm_driver = {
 	sizeof(struct imxccm_softc),
 };
 
-static devclass_t imxccm_devclass;
-
-EARLY_DRIVER_MODULE(imxccm, simplebus, imxccm_driver, imxccm_devclass, 0, 0,
-    BUS_PASS_CPU);
+EARLY_DRIVER_MODULE(imxccm, simplebus, imxccm_driver, 0, 0, BUS_PASS_CPU);
 
 static inline uint32_t
 pll_read_4(struct imxccm_softc *sc, int pll, int reg)
diff --git a/sys/arm/freescale/imx/imx51_ipuv3.c b/sys/arm/freescale/imx/imx51_ipuv3.c
index a29a562719d4..49d1bea631a3 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3.c
@@ -424,15 +424,13 @@ static device_method_t ipu3_fb_methods[] = {
 	{ 0, 0 }
 };
 
-static devclass_t ipu3_fb_devclass;
-
 static driver_t ipu3_fb_driver = {
 	"fb",
 	ipu3_fb_methods,
 	sizeof(struct ipu3sc_softc),
 };
 
-DRIVER_MODULE(ipu3fb, simplebus, ipu3_fb_driver, ipu3_fb_devclass, 0, 0);
+DRIVER_MODULE(ipu3fb, simplebus, ipu3_fb_driver, 0, 0);
 
 /*
  * Video driver routines and glue.
diff --git a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
index be1526228bf4..8abf26f612ce 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
@@ -353,12 +353,10 @@ static device_method_t ipu3_fb_methods[] = {
 	{ 0, 0 }
 };
 
-static devclass_t ipu3_fb_devclass;
-
 static driver_t ipu3_fb_driver = {
 	"fb",
 	ipu3_fb_methods,
 	sizeof(struct ipu3sc_softc),
 };
 
-DRIVER_MODULE(fb, simplebus, ipu3_fb_driver, ipu3_fb_devclass, 0, 0);
+DRIVER_MODULE(fb, simplebus, ipu3_fb_driver, 0, 0);
diff --git a/sys/arm/freescale/imx/imx6_anatop.c b/sys/arm/freescale/imx/imx6_anatop.c
index a233cf9ab354..50a9b32611b5 100644
--- a/sys/arm/freescale/imx/imx6_anatop.c
+++ b/sys/arm/freescale/imx/imx6_anatop.c
@@ -810,9 +810,7 @@ static driver_t imx6_anatop_driver = {
 	sizeof(struct imx6_anatop_softc)
 };
 
-static devclass_t imx6_anatop_devclass;
-
-EARLY_DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver,
-    imx6_anatop_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
-EARLY_DRIVER_MODULE(imx6_anatop, ofwbus, imx6_anatop_driver,
-    imx6_anatop_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(imx6_anatop, ofwbus, imx6_anatop_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/freescale/imx/imx6_audmux.c b/sys/arm/freescale/imx/imx6_audmux.c
index 61ec0b6da510..cc4ab56a112a 100644
--- a/sys/arm/freescale/imx/imx6_audmux.c
+++ b/sys/arm/freescale/imx/imx6_audmux.c
@@ -152,6 +152,4 @@ static driver_t audmux_driver = {
 	sizeof(struct audmux_softc),
 };
 
-static devclass_t audmux_devclass;
-
-DRIVER_MODULE(audmux, simplebus, audmux_driver, audmux_devclass, 0, 0);
+DRIVER_MODULE(audmux, simplebus, audmux_driver, 0, 0);
diff --git a/sys/arm/freescale/imx/imx6_ccm.c b/sys/arm/freescale/imx/imx6_ccm.c
index 5bdb71caa4bd..f4b7ae68de28 100644
--- a/sys/arm/freescale/imx/imx6_ccm.c
+++ b/sys/arm/freescale/imx/imx6_ccm.c
@@ -514,7 +514,5 @@ static driver_t ccm_driver = {
 	sizeof(struct ccm_softc)
 };
 
-static devclass_t ccm_devclass;
-
-EARLY_DRIVER_MODULE(ccm, simplebus, ccm_driver, ccm_devclass, 0, 0, 
+EARLY_DRIVER_MODULE(ccm, simplebus, ccm_driver, 0, 0, 
     BUS_PASS_CPU + BUS_PASS_ORDER_EARLY);
diff --git a/sys/arm/freescale/imx/imx6_hdmi.c b/sys/arm/freescale/imx/imx6_hdmi.c
index cd89710be897..28a62a66fd01 100644
--- a/sys/arm/freescale/imx/imx6_hdmi.c
+++ b/sys/arm/freescale/imx/imx6_hdmi.c
@@ -213,6 +213,4 @@ static driver_t imx_hdmi_driver = {
 	sizeof(struct imx_hdmi_softc)
 };
 
-static devclass_t imx_hdmi_devclass;
-
-DRIVER_MODULE(hdmi, simplebus, imx_hdmi_driver, imx_hdmi_devclass, 0, 0);
+DRIVER_MODULE(hdmi, simplebus, imx_hdmi_driver, 0, 0);
diff --git a/sys/arm/freescale/imx/imx6_ipu.c b/sys/arm/freescale/imx/imx6_ipu.c
index 417f8f64a28c..be9487620a06 100644
--- a/sys/arm/freescale/imx/imx6_ipu.c
+++ b/sys/arm/freescale/imx/imx6_ipu.c
@@ -1265,8 +1265,6 @@ static driver_t ipu_driver = {
 	sizeof(struct ipu_softc),
 };
 
-static devclass_t ipu_devclass;
-
-DRIVER_MODULE(ipu, simplebus, ipu_driver, ipu_devclass, 0, 0);
+DRIVER_MODULE(ipu, simplebus, ipu_driver, 0, 0);
 MODULE_VERSION(ipu, 1);
 MODULE_DEPEND(ipu, simplebus, 1, 1, 1);
diff --git a/sys/arm/freescale/imx/imx6_sdma.c b/sys/arm/freescale/imx/imx6_sdma.c
index 88e07fa3418e..ce33791ede0d 100644
--- a/sys/arm/freescale/imx/imx6_sdma.c
+++ b/sys/arm/freescale/imx/imx6_sdma.c
@@ -517,8 +517,6 @@ static driver_t sdma_driver = {
 	sizeof(struct sdma_softc),
 };
 
-static devclass_t sdma_devclass;
-
 /* We want to attach after all interrupt controllers, before anything else. */
-EARLY_DRIVER_MODULE(sdma, simplebus, sdma_driver, sdma_devclass, 0, 0,
+EARLY_DRIVER_MODULE(sdma, simplebus, sdma_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
diff --git a/sys/arm/freescale/imx/imx6_snvs.c b/sys/arm/freescale/imx/imx6_snvs.c
index 138abb883b7e..1ee930f6c487 100644
--- a/sys/arm/freescale/imx/imx6_snvs.c
+++ b/sys/arm/freescale/imx/imx6_snvs.c
@@ -229,7 +229,5 @@ static driver_t snvs_driver = {
 	sizeof(struct snvs_softc),
 };
 
-static devclass_t snvs_devclass;
-
-DRIVER_MODULE(snvs, simplebus, snvs_driver, snvs_devclass, 0, 0);
+DRIVER_MODULE(snvs, simplebus, snvs_driver, 0, 0);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/freescale/imx/imx6_src.c b/sys/arm/freescale/imx/imx6_src.c
index 325c8befabc3..4d7e2026e719 100644
--- a/sys/arm/freescale/imx/imx6_src.c
+++ b/sys/arm/freescale/imx/imx6_src.c
@@ -168,6 +168,4 @@ static driver_t src_driver = {
 	sizeof(struct src_softc)
 };
 
-static devclass_t src_devclass;
-
-DRIVER_MODULE(src, simplebus, src_driver, src_devclass, 0, 0);
+DRIVER_MODULE(src, simplebus, src_driver, 0, 0);
diff --git a/sys/arm/freescale/imx/imx6_usbphy.c b/sys/arm/freescale/imx/imx6_usbphy.c
index 56d3cce907a6..f9259febbfd9 100644
--- a/sys/arm/freescale/imx/imx6_usbphy.c
+++ b/sys/arm/freescale/imx/imx6_usbphy.c
@@ -198,12 +198,10 @@ static driver_t usbphy_driver = {
 	sizeof(struct usbphy_softc)
 };
 
-static devclass_t usbphy_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 SUPPORTDEV
  * is where this driver fits most.
  */
-EARLY_DRIVER_MODULE(usbphy, simplebus, usbphy_driver, usbphy_devclass, 0, 0,
+EARLY_DRIVER_MODULE(usbphy, simplebus, usbphy_driver, 0, 0,
     BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/freescale/imx/imx_epit.c b/sys/arm/freescale/imx/imx_epit.c
index 1295bc75c783..897972f8bd31 100644
--- a/sys/arm/freescale/imx/imx_epit.c
+++ b/sys/arm/freescale/imx/imx_epit.c
@@ -485,7 +485,4 @@ static driver_t epit_driver = {
 	sizeof(struct epit_softc),
 };
 
-static devclass_t epit_devclass;
-
-EARLY_DRIVER_MODULE(imx_epit, simplebus, epit_driver, epit_devclass, 0,
-    0, BUS_PASS_TIMER);
+EARLY_DRIVER_MODULE(imx_epit, simplebus, epit_driver, 0, 0, BUS_PASS_TIMER);
diff --git a/sys/arm/freescale/imx/imx_gpio.c b/sys/arm/freescale/imx/imx_gpio.c
index 7c86a78a15cc..932e321449cf 100644
--- a/sys/arm/freescale/imx/imx_gpio.c
+++ b/sys/arm/freescale/imx/imx_gpio.c
@@ -952,7 +952,6 @@ static driver_t imx51_gpio_driver = {
 	imx51_gpio_methods,
 	sizeof(struct imx51_gpio_softc),
 };
-static devclass_t imx51_gpio_devclass;
 
-EARLY_DRIVER_MODULE(imx51_gpio, simplebus, imx51_gpio_driver,
-    imx51_gpio_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(imx51_gpio, simplebus, imx51_gpio_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/freescale/imx/imx_gpt.c b/sys/arm/freescale/imx/imx_gpt.c
index 0605f5ca3558..dfe25ef95829 100644
--- a/sys/arm/freescale/imx/imx_gpt.c
+++ b/sys/arm/freescale/imx/imx_gpt.c
@@ -394,10 +394,7 @@ static driver_t imx_gpt_driver = {
 	sizeof(struct imx_gpt_softc),
 };
 
-static devclass_t imx_gpt_devclass;
-
-EARLY_DRIVER_MODULE(imx_gpt, simplebus, imx_gpt_driver, imx_gpt_devclass, 0,
-    0, BUS_PASS_TIMER);
+EARLY_DRIVER_MODULE(imx_gpt, simplebus, imx_gpt_driver, 0, 0, BUS_PASS_TIMER);
 
 static void
 imx_gpt_do_delay(int usec, void *arg)
diff --git a/sys/arm/freescale/imx/imx_i2c.c b/sys/arm/freescale/imx/imx_i2c.c
index 714e6519d940..3a3e85901e35 100644
--- a/sys/arm/freescale/imx/imx_i2c.c
+++ b/sys/arm/freescale/imx/imx_i2c.c
@@ -200,9 +200,8 @@ static driver_t i2c_driver = {
 	i2c_methods,
 	sizeof(struct i2c_softc),
 };
-static devclass_t  i2c_devclass;
 
-DRIVER_MODULE(imx_i2c, simplebus, i2c_driver, i2c_devclass, 0, 0);
+DRIVER_MODULE(imx_i2c, simplebus, i2c_driver, 0, 0);
 DRIVER_MODULE(ofw_iicbus, imx_i2c, ofw_iicbus_driver, 0, 0);
 MODULE_DEPEND(imx_i2c, iicbus, 1, 1, 1);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/freescale/imx/imx_iomux.c b/sys/arm/freescale/imx/imx_iomux.c
index bae89f80902f..8675ce2f2bc8 100644
--- a/sys/arm/freescale/imx/imx_iomux.c
+++ b/sys/arm/freescale/imx/imx_iomux.c
@@ -324,7 +324,5 @@ static driver_t imx_iomux_driver = {
 	sizeof(struct iomux_softc),
 };
 
-static devclass_t imx_iomux_devclass;
-
-EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver, 
-    imx_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver, 0, 0,
+    BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/freescale/imx/imx_nop_usbphy.c b/sys/arm/freescale/imx/imx_nop_usbphy.c
index 357a237c2a61..57a20215d056 100644
--- a/sys/arm/freescale/imx/imx_nop_usbphy.c
+++ b/sys/arm/freescale/imx/imx_nop_usbphy.c
@@ -114,6 +114,4 @@ static driver_t usbphy_driver = {
 	sizeof(struct usbphy_softc)
 };
 
-static devclass_t usbphy_devclass;
-
-DRIVER_MODULE(usbphy, simplebus, usbphy_driver, usbphy_devclass, 0, 0);
+DRIVER_MODULE(usbphy, simplebus, usbphy_driver, 0, 0);
diff --git a/sys/arm/freescale/imx/imx_spi.c b/sys/arm/freescale/imx/imx_spi.c
index 127cfa905a7a..5c084a964e7e 100644
--- a/sys/arm/freescale/imx/imx_spi.c
+++ b/sys/arm/freescale/imx/imx_spi.c
@@ -603,9 +603,7 @@ static driver_t spi_driver = {
 	sizeof(struct spi_softc),
 };
 
-static devclass_t spi_devclass;
-
-DRIVER_MODULE(imx_spi, simplebus, spi_driver, spi_devclass, 0, 0);
+DRIVER_MODULE(imx_spi, simplebus, spi_driver, 0, 0);
 DRIVER_MODULE(ofw_spibus, imx_spi, ofw_spibus_driver, 0, 0);
 MODULE_DEPEND(imx_spi, ofw_spibus, 1, 1, 1);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/freescale/imx/imx_wdog.c b/sys/arm/freescale/imx/imx_wdog.c
index 287a8771f791..3586c0cecb6c 100644
--- a/sys/arm/freescale/imx/imx_wdog.c
+++ b/sys/arm/freescale/imx/imx_wdog.c
@@ -256,8 +256,5 @@ static driver_t imx_wdog_driver = {
 	sizeof(struct imx_wdog_softc),
 };
 
-static devclass_t imx_wdog_devclass;
-
-EARLY_DRIVER_MODULE(imx_wdog, simplebus, imx_wdog_driver,
-    imx_wdog_devclass, 0, 0, BUS_PASS_TIMER);
+EARLY_DRIVER_MODULE(imx_wdog, simplebus, imx_wdog_driver, 0, 0, BUS_PASS_TIMER);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/freescale/imx/tzic.c b/sys/arm/freescale/imx/tzic.c
index cddbd6ba9919..203f1395549c 100644
--- a/sys/arm/freescale/imx/tzic.c
+++ b/sys/arm/freescale/imx/tzic.c
@@ -305,7 +305,4 @@ static driver_t tzic_driver = {
 	sizeof(struct tzic_softc),
 };
 
-static devclass_t tzic_devclass;
-
-EARLY_DRIVER_MODULE(tzic, ofwbus, tzic_driver, tzic_devclass, 0, 0,
-    BUS_PASS_INTERRUPT);
+EARLY_DRIVER_MODULE(tzic, ofwbus, tzic_driver, 0, 0, BUS_PASS_INTERRUPT);
diff --git a/sys/arm/freescale/vybrid/vf_adc.c b/sys/arm/freescale/vybrid/vf_adc.c
index bdb6e826e176..27c2a7498827 100644
--- a/sys/arm/freescale/vybrid/vf_adc.c
+++ b/sys/arm/freescale/vybrid/vf_adc.c
@@ -235,6 +235,4 @@ static driver_t adc_driver = {
 	sizeof(struct adc_softc),
 };
 
-static devclass_t adc_devclass;
-
-DRIVER_MODULE(adc, simplebus, adc_driver, adc_devclass, 0, 0);
+DRIVER_MODULE(adc, simplebus, adc_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_anadig.c b/sys/arm/freescale/vybrid/vf_anadig.c
index a8f944baf5fe..ba1002ebadd1 100644
--- a/sys/arm/freescale/vybrid/vf_anadig.c
+++ b/sys/arm/freescale/vybrid/vf_anadig.c
@@ -241,6 +241,4 @@ static driver_t anadig_driver = {
 	sizeof(struct anadig_softc),
 };
 
-static devclass_t anadig_devclass;
-
-DRIVER_MODULE(anadig, simplebus, anadig_driver, anadig_devclass, 0, 0);
+DRIVER_MODULE(anadig, simplebus, anadig_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_ccm.c b/sys/arm/freescale/vybrid/vf_ccm.c
index bfb957338af7..85d485153316 100644
--- a/sys/arm/freescale/vybrid/vf_ccm.c
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -496,6 +496,4 @@ static driver_t ccm_driver = {
 	sizeof(struct ccm_softc),
 };
 
-static devclass_t ccm_devclass;
-
-DRIVER_MODULE(ccm, simplebus, ccm_driver, ccm_devclass, 0, 0);
+DRIVER_MODULE(ccm, simplebus, ccm_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_dcu4.c b/sys/arm/freescale/vybrid/vf_dcu4.c
index 9e455d6027c6..0a7cca839f8a 100644
--- a/sys/arm/freescale/vybrid/vf_dcu4.c
+++ b/sys/arm/freescale/vybrid/vf_dcu4.c
@@ -466,6 +466,4 @@ static driver_t dcu_driver = {
 	sizeof(struct dcu_softc),
 };
 
-static devclass_t dcu_devclass;
-
-DRIVER_MODULE(fb, simplebus, dcu_driver, dcu_devclass, 0, 0);
+DRIVER_MODULE(fb, simplebus, dcu_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_dmamux.c b/sys/arm/freescale/vybrid/vf_dmamux.c
index 978bab5fc1c7..49ff93de7516 100644
--- a/sys/arm/freescale/vybrid/vf_dmamux.c
+++ b/sys/arm/freescale/vybrid/vf_dmamux.c
@@ -150,6 +150,4 @@ static driver_t dmamux_driver = {
 	sizeof(struct dmamux_softc),
 };
 
-static devclass_t dmamux_devclass;
-
-DRIVER_MODULE(dmamux, simplebus, dmamux_driver, dmamux_devclass, 0, 0);
+DRIVER_MODULE(dmamux, simplebus, dmamux_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_edma.c b/sys/arm/freescale/vybrid/vf_edma.c
index 801a1e1dfb76..8b47fb3d2aef 100644
--- a/sys/arm/freescale/vybrid/vf_edma.c
+++ b/sys/arm/freescale/vybrid/vf_edma.c
@@ -335,6 +335,4 @@ static driver_t edma_driver = {
 	sizeof(struct edma_softc),
 };
 
-static devclass_t edma_devclass;
-
-DRIVER_MODULE(edma, simplebus, edma_driver, edma_devclass, 0, 0);
+DRIVER_MODULE(edma, simplebus, edma_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_ehci.c b/sys/arm/freescale/vybrid/vf_ehci.c
index 8c1ddfc7d79e..6f0657a78563 100644
--- a/sys/arm/freescale/vybrid/vf_ehci.c
+++ b/sys/arm/freescale/vybrid/vf_ehci.c
@@ -163,9 +163,7 @@ static driver_t ehci_driver = {
 	sizeof(ehci_softc_t)
 };
 
-static devclass_t ehci_devclass;
-
-DRIVER_MODULE(vybrid_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(vybrid_ehci, simplebus, ehci_driver, 0, 0);
 MODULE_DEPEND(vybrid_ehci, usb, 1, 1, 1);
 
 static void
diff --git a/sys/arm/freescale/vybrid/vf_gpio.c b/sys/arm/freescale/vybrid/vf_gpio.c
index cfa40693dfbe..d6b7fa234358 100644
--- a/sys/arm/freescale/vybrid/vf_gpio.c
+++ b/sys/arm/freescale/vybrid/vf_gpio.c
@@ -381,6 +381,4 @@ static driver_t vf_gpio_driver = {
 	sizeof(struct vf_gpio_softc),
 };
 
-static devclass_t vf_gpio_devclass;
-
-DRIVER_MODULE(vf_gpio, simplebus, vf_gpio_driver, vf_gpio_devclass, 0, 0);
+DRIVER_MODULE(vf_gpio, simplebus, vf_gpio_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
index 05533230bc22..7b3e87f84c34 100644
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -607,8 +607,7 @@ static device_method_t i2c_methods[] = {
 	{ 0, 0 }
 };
 
-static devclass_t i2c_devclass;
 static DEFINE_CLASS_0(i2c, i2c_driver, i2c_methods, sizeof(struct i2c_softc));
-DRIVER_MODULE(vybrid_i2c, simplebus, i2c_driver, i2c_devclass, 0, 0);
+DRIVER_MODULE(vybrid_i2c, simplebus, i2c_driver, 0, 0);
 DRIVER_MODULE(iicbus, i2c, iicbus_driver, 0, 0);
 DRIVER_MODULE(ofw_iicbus, i2c, ofw_iicbus_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.c b/sys/arm/freescale/vybrid/vf_iomuxc.c
index e46dd31c2efb..1ed60abf0c02 100644
--- a/sys/arm/freescale/vybrid/vf_iomuxc.c
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.c
@@ -207,6 +207,4 @@ static driver_t iomuxc_driver = {
 	sizeof(struct iomuxc_softc),
 };
 
-static devclass_t iomuxc_devclass;
-
-DRIVER_MODULE(iomuxc, simplebus, iomuxc_driver, iomuxc_devclass, 0, 0);
+DRIVER_MODULE(iomuxc, simplebus, iomuxc_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_mscm.c b/sys/arm/freescale/vybrid/vf_mscm.c
index aa29175468af..159b28c5b4e1 100644
--- a/sys/arm/freescale/vybrid/vf_mscm.c
+++ b/sys/arm/freescale/vybrid/vf_mscm.c
@@ -121,6 +121,4 @@ static driver_t mscm_driver = {
 	sizeof(struct mscm_softc),
 };
 
-static devclass_t mscm_devclass;
-
-DRIVER_MODULE(mscm, simplebus, mscm_driver, mscm_devclass, 0, 0);
+DRIVER_MODULE(mscm, simplebus, mscm_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_port.c b/sys/arm/freescale/vybrid/vf_port.c
index d04cf4a08b37..b1b797ae328c 100644
--- a/sys/arm/freescale/vybrid/vf_port.c
+++ b/sys/arm/freescale/vybrid/vf_port.c
@@ -244,6 +244,4 @@ static driver_t port_driver = {
 	sizeof(struct port_softc),
 };
 
-static devclass_t port_devclass;
-
-DRIVER_MODULE(port, simplebus, port_driver, port_devclass, 0, 0);
+DRIVER_MODULE(port, simplebus, port_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_spi.c b/sys/arm/freescale/vybrid/vf_spi.c
index a264b5d2c965..f625b25f634a 100644
--- a/sys/arm/freescale/vybrid/vf_spi.c
+++ b/sys/arm/freescale/vybrid/vf_spi.c
@@ -288,6 +288,4 @@ static driver_t spi_driver = {
 	sizeof(struct spi_softc),
 };
 
-static devclass_t spi_devclass;
-
-DRIVER_MODULE(spi, simplebus, spi_driver, spi_devclass, 0, 0);
+DRIVER_MODULE(spi, simplebus, spi_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_src.c b/sys/arm/freescale/vybrid/vf_src.c
index bd1467819e2c..d1307364d0bd 100644
--- a/sys/arm/freescale/vybrid/vf_src.c
+++ b/sys/arm/freescale/vybrid/vf_src.c
@@ -145,6 +145,4 @@ static driver_t src_driver = {
 	sizeof(struct src_softc),
 };
 
-static devclass_t src_devclass;
-
-DRIVER_MODULE(src, simplebus, src_driver, src_devclass, 0, 0);
+DRIVER_MODULE(src, simplebus, src_driver, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_tcon.c b/sys/arm/freescale/vybrid/vf_tcon.c
index 847641a30d22..a6cbb97e1c00 100644
--- a/sys/arm/freescale/vybrid/vf_tcon.c
+++ b/sys/arm/freescale/vybrid/vf_tcon.c
@@ -130,6 +130,4 @@ static driver_t tcon_driver = {
 	sizeof(struct tcon_softc),
 };
 
-static devclass_t tcon_devclass;
-
-DRIVER_MODULE(tcon, simplebus, tcon_driver, tcon_devclass, 0, 0);
+DRIVER_MODULE(tcon, simplebus, tcon_driver, 0, 0);
diff --git a/sys/arm64/freescale/imx/imx7gpc.c b/sys/arm64/freescale/imx/imx7gpc.c
index baad16452982..9c4e74e4b776 100644
--- a/sys/arm64/freescale/imx/imx7gpc.c
+++ b/sys/arm64/freescale/imx/imx7gpc.c
@@ -239,9 +239,7 @@ static driver_t imx7gpc_driver = {
 	sizeof(struct imx7gpc_softc),
 };
 
-static devclass_t imx7gpc_devclass;
-
-EARLY_DRIVER_MODULE(imx7gpc, ofwbus, imx7gpc_driver, imx7gpc_devclass, 0, 0,
+EARLY_DRIVER_MODULE(imx7gpc, ofwbus, imx7gpc_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
-EARLY_DRIVER_MODULE(imx7gpc, simplebus, imx7gpc_driver, imx7gpc_devclass, 0, 0,
+EARLY_DRIVER_MODULE(imx7gpc, simplebus, imx7gpc_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/freescale/imx/imx8mq_ccm.c b/sys/arm64/freescale/imx/imx8mq_ccm.c
index 9a0c8f318e39..57b6bcc7a97b 100644
--- a/sys/arm64/freescale/imx/imx8mq_ccm.c
+++ b/sys/arm64/freescale/imx/imx8mq_ccm.c
@@ -480,7 +480,5 @@ static driver_t ccm_driver = {
 	sizeof(struct ccm_softc)
 };
 
-static devclass_t ccm_devclass;
-
-EARLY_DRIVER_MODULE(ccm, simplebus, ccm_driver, ccm_devclass, 0, 0, 
+EARLY_DRIVER_MODULE(ccm, simplebus, ccm_driver, 0, 0, 
     BUS_PASS_CPU + BUS_PASS_ORDER_EARLY);