git: 8537e6713004 - main - arm ti: Remove unused devclass arguments to DRIVER_MODULE.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Mon, 09 May 2022 21:47:53 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=8537e67130044c78a7e7d08e346c076737cee2ca

commit 8537e67130044c78a7e7d08e346c076737cee2ca
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-09 21:26:45 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-09 21:26:45 +0000

    arm ti: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/arm/ti/aintc.c                 |  6 ++----
 sys/arm/ti/am335x/am3359_cppi41.c  |  6 ++----
 sys/arm/ti/am335x/am335x_dmtimer.c |  4 +---
 sys/arm/ti/am335x/am335x_dmtpps.c  |  4 +---
 sys/arm/ti/am335x/am335x_ecap.c    |  4 +---
 sys/arm/ti/am335x/am335x_ehrpwm.c  |  4 +---
 sys/arm/ti/am335x/am335x_gpio.c    |  4 +---
 sys/arm/ti/am335x/am335x_lcd.c     |  4 +---
 sys/arm/ti/am335x/am335x_musb.c    |  4 +---
 sys/arm/ti/am335x/am335x_pmic.c    |  4 +---
 sys/arm/ti/am335x/am335x_pwmss.c   |  3 +--
 sys/arm/ti/am335x/am335x_rtc.c     |  4 +---
 sys/arm/ti/am335x/am335x_scm.c     |  4 +---
 sys/arm/ti/am335x/am335x_usb_phy.c |  6 ++----
 sys/arm/ti/am335x/tda19988.c       |  4 +---
 sys/arm/ti/clk/ti_clkctrl.c        |  6 ++----
 sys/arm/ti/clk/ti_divider_clock.c  |  6 ++----
 sys/arm/ti/clk/ti_dpll_clock.c     |  6 ++----
 sys/arm/ti/clk/ti_gate_clock.c     |  6 ++----
 sys/arm/ti/clk/ti_mux_clock.c      |  6 ++----
 sys/arm/ti/cpsw/if_cpsw.c          |  8 ++------
 sys/arm/ti/omap4/omap4_gpio.c      |  4 +---
 sys/arm/ti/omap4/omap4_prcm_clks.c |  6 ++----
 sys/arm/ti/omap4/omap4_wugen.c     |  5 ++---
 sys/arm/ti/ti_adc.c                |  4 +---
 sys/arm/ti/ti_edma3.c              |  3 +--
 sys/arm/ti/ti_i2c.c                |  4 +---
 sys/arm/ti/ti_mbox.c               |  4 +---
 sys/arm/ti/ti_omap4_cm.c           | 10 ++++------
 sys/arm/ti/ti_pinmux.c             |  4 +---
 sys/arm/ti/ti_prcm.c               |  9 +++------
 sys/arm/ti/ti_prm.c                |  6 ++----
 sys/arm/ti/ti_pruss.c              |  4 +---
 sys/arm/ti/ti_scm.c                |  6 ++----
 sys/arm/ti/ti_scm_syscon.c         |  6 ++----
 sys/arm/ti/ti_sdhci.c              |  5 +----
 sys/arm/ti/ti_sdma.c               |  3 +--
 sys/arm/ti/ti_spi.c                |  4 +---
 sys/arm/ti/ti_sysc.c               |  6 ++----
 sys/arm/ti/ti_wdt.c                |  4 +---
 sys/arm/ti/twl/twl.c               |  3 +--
 sys/arm/ti/twl/twl_clks.c          |  4 +---
 sys/arm/ti/twl/twl_vreg.c          |  4 +---
 sys/arm/ti/usb/omap_ehci.c         |  4 +---
 sys/arm/ti/usb/omap_host.c         |  3 +--
 sys/arm/ti/usb/omap_tll.c          |  4 +---
 46 files changed, 66 insertions(+), 156 deletions(-)

diff --git a/sys/arm/ti/aintc.c b/sys/arm/ti/aintc.c
index 118a97e9f989..a5e9e349c698 100644
--- a/sys/arm/ti/aintc.c
+++ b/sys/arm/ti/aintc.c
@@ -302,8 +302,6 @@ static driver_t ti_aintc_driver = {
 	sizeof(struct ti_aintc_softc),
 };
 
-static devclass_t ti_aintc_devclass;
-
-EARLY_DRIVER_MODULE(ti_aintc, simplebus, ti_aintc_driver, ti_aintc_devclass,
-    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_aintc, simplebus, ti_aintc_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/ti/am335x/am3359_cppi41.c b/sys/arm/ti/am335x/am3359_cppi41.c
index 57d049cde8ea..58cfc927c485 100644
--- a/sys/arm/ti/am335x/am3359_cppi41.c
+++ b/sys/arm/ti/am335x/am3359_cppi41.c
@@ -180,9 +180,7 @@ DEFINE_CLASS_1(ti_am3359_cppi41, ti_am3359_cppi41_driver,
     ti_am3359_cppi41_methods,sizeof(struct ti_am3359_cppi41_softc),
     simplebus_driver);
 
-static devclass_t ti_am3359_cppi41_devclass;
-
-EARLY_DRIVER_MODULE(ti_am3359_cppi41, simplebus, ti_am3359_cppi41_driver,
-    ti_am3359_cppi41_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_am3359_cppi41, simplebus, ti_am3359_cppi41_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_am3359_cppi41, 1);
 MODULE_DEPEND(ti_am3359_cppi41, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index eb869ca88b94..82b50a47ce63 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -379,9 +379,7 @@ static driver_t am335x_dmtimer_driver = {
 	sizeof(struct am335x_dmtimer_softc),
 };
 
-static devclass_t am335x_dmtimer_devclass;
-
-DRIVER_MODULE(am335x_dmtimer, simplebus, am335x_dmtimer_driver, am335x_dmtimer_devclass, 0, 0);
+DRIVER_MODULE(am335x_dmtimer, simplebus, am335x_dmtimer_driver, 0, 0);
 MODULE_DEPEND(am335x_dmtimer, ti_sysc, 1, 1, 1);
 
 static void
diff --git a/sys/arm/ti/am335x/am335x_dmtpps.c b/sys/arm/ti/am335x/am335x_dmtpps.c
index 24d83f248eef..ce868dcf5d22 100644
--- a/sys/arm/ti/am335x/am335x_dmtpps.c
+++ b/sys/arm/ti/am335x/am335x_dmtpps.c
@@ -615,7 +615,5 @@ static driver_t dmtpps_driver = {
 	sizeof(struct dmtpps_softc),
 };
 
-static devclass_t dmtpps_devclass;
-
-DRIVER_MODULE(am335x_dmtpps, simplebus, dmtpps_driver, dmtpps_devclass, 0, 0);
+DRIVER_MODULE(am335x_dmtpps, simplebus, dmtpps_driver, 0, 0);
 MODULE_DEPEND(am335x_dmtpps, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_ecap.c b/sys/arm/ti/am335x/am335x_ecap.c
index 17bddb5c1a8f..c074f576da2d 100644
--- a/sys/arm/ti/am335x/am335x_ecap.c
+++ b/sys/arm/ti/am335x/am335x_ecap.c
@@ -95,8 +95,6 @@ static driver_t am335x_ecap_driver = {
 	sizeof(struct am335x_ecap_softc),
 };
 
-static devclass_t am335x_ecap_devclass;
-
 /*
  * API function to set period/duty cycles for ECAPx
  */
@@ -194,6 +192,6 @@ am335x_ecap_detach(device_t dev)
 	return (0);
 }
 
-DRIVER_MODULE(am335x_ecap, am335x_pwmss, am335x_ecap_driver, am335x_ecap_devclass, 0, 0);
+DRIVER_MODULE(am335x_ecap, am335x_pwmss, am335x_ecap_driver, 0, 0);
 MODULE_VERSION(am335x_ecap, 1);
 MODULE_DEPEND(am335x_ecap, am335x_pwmss, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_ehrpwm.c b/sys/arm/ti/am335x/am335x_ehrpwm.c
index 49d0c01ca5f4..5144607ae5e5 100644
--- a/sys/arm/ti/am335x/am335x_ehrpwm.c
+++ b/sys/arm/ti/am335x/am335x_ehrpwm.c
@@ -594,9 +594,7 @@ static driver_t am335x_ehrpwm_driver = {
 	sizeof(struct am335x_ehrpwm_softc),
 };
 
-static devclass_t am335x_ehrpwm_devclass;
-
-DRIVER_MODULE(am335x_ehrpwm, am335x_pwmss, am335x_ehrpwm_driver, am335x_ehrpwm_devclass, 0, 0);
+DRIVER_MODULE(am335x_ehrpwm, am335x_pwmss, am335x_ehrpwm_driver, 0, 0);
 MODULE_VERSION(am335x_ehrpwm, 1);
 MODULE_DEPEND(am335x_ehrpwm, am335x_pwmss, 1, 1, 1);
 MODULE_DEPEND(am335x_ehrpwm, pwmbus, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_gpio.c b/sys/arm/ti/am335x/am335x_gpio.c
index beb169b3e4b5..e5c1b8572276 100644
--- a/sys/arm/ti/am335x/am335x_gpio.c
+++ b/sys/arm/ti/am335x/am335x_gpio.c
@@ -149,10 +149,8 @@ static device_method_t am335x_gpio_methods[] = {
 };
 
 extern driver_t ti_gpio_driver;
-static devclass_t am335x_gpio_devclass;
 
 DEFINE_CLASS_1(gpio, am335x_gpio_driver, am335x_gpio_methods,
     sizeof(struct ti_gpio_softc), ti_gpio_driver);
-DRIVER_MODULE(am335x_gpio, simplebus, am335x_gpio_driver, am335x_gpio_devclass,
-    0, 0);
+DRIVER_MODULE(am335x_gpio, simplebus, am335x_gpio_driver, 0, 0);
 MODULE_DEPEND(am335x_gpio, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
index 387bd37e3ebf..06563a476a3c 100644
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -1096,9 +1096,7 @@ static driver_t am335x_lcd_driver = {
 	sizeof(struct am335x_lcd_softc),
 };
 
-static devclass_t am335x_lcd_devclass;
-
-DRIVER_MODULE(am335x_lcd, simplebus, am335x_lcd_driver, am335x_lcd_devclass, 0, 0);
+DRIVER_MODULE(am335x_lcd, simplebus, am335x_lcd_driver, 0, 0);
 MODULE_VERSION(am335x_lcd, 1);
 MODULE_DEPEND(am335x_lcd, simplebus, 1, 1, 1);
 MODULE_DEPEND(am335x_lcd, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c
index 2143338a39f7..2889e8c1b7d4 100644
--- a/sys/arm/ti/am335x/am335x_musb.c
+++ b/sys/arm/ti/am335x/am335x_musb.c
@@ -453,9 +453,7 @@ static driver_t musbotg_driver = {
 	.size = sizeof(struct musbotg_super_softc),
 };
 
-static devclass_t musbotg_devclass;
-
-DRIVER_MODULE(musbotg, ti_sysc, musbotg_driver, musbotg_devclass, 0, 0);
+DRIVER_MODULE(musbotg, ti_sysc, musbotg_driver, 0, 0);
 MODULE_DEPEND(musbotg, ti_sysc, 1, 1, 1);
 MODULE_DEPEND(musbotg, ti_am3359_cppi41, 1, 1, 1);
 MODULE_DEPEND(usbss, usb, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_pmic.c b/sys/arm/ti/am335x/am335x_pmic.c
index 0b0782ab72a6..fd0faf4c7a12 100644
--- a/sys/arm/ti/am335x/am335x_pmic.c
+++ b/sys/arm/ti/am335x/am335x_pmic.c
@@ -321,8 +321,6 @@ static driver_t am335x_pmic_driver = {
 	sizeof(struct am335x_pmic_softc),
 };
 
-static devclass_t am335x_pmic_devclass;
-
-DRIVER_MODULE(am335x_pmic, iicbus, am335x_pmic_driver, am335x_pmic_devclass, 0, 0);
+DRIVER_MODULE(am335x_pmic, iicbus, am335x_pmic_driver, 0, 0);
 MODULE_VERSION(am335x_pmic, 1);
 MODULE_DEPEND(am335x_pmic, iicbus, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_pwmss.c b/sys/arm/ti/am335x/am335x_pwmss.c
index 287b6ce9e8fe..aaab294dbb18 100644
--- a/sys/arm/ti/am335x/am335x_pwmss.c
+++ b/sys/arm/ti/am335x/am335x_pwmss.c
@@ -173,7 +173,6 @@ am335x_pwmss_detach(device_t dev)
 
 DEFINE_CLASS_1(am335x_pwmss, am335x_pwmss_driver, am335x_pwmss_methods,
     sizeof(struct am335x_pwmss_softc), simplebus_driver);
-static devclass_t am335x_pwmss_devclass;
-DRIVER_MODULE(am335x_pwmss, simplebus, am335x_pwmss_driver, am335x_pwmss_devclass, 0, 0);
+DRIVER_MODULE(am335x_pwmss, simplebus, am335x_pwmss_driver, 0, 0);
 MODULE_VERSION(am335x_pwmss, 1);
 MODULE_DEPEND(am335x_pwmss, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_rtc.c b/sys/arm/ti/am335x/am335x_rtc.c
index c2612d2fc7a9..2ca14f4d9048 100644
--- a/sys/arm/ti/am335x/am335x_rtc.c
+++ b/sys/arm/ti/am335x/am335x_rtc.c
@@ -205,9 +205,7 @@ static driver_t am335x_rtc_driver = {
 	sizeof(struct am335x_rtc_softc),
 };
 
-static devclass_t am335x_rtc_devclass;
-
-DRIVER_MODULE(am335x_rtc, simplebus, am335x_rtc_driver, am335x_rtc_devclass, 0, 0);
+DRIVER_MODULE(am335x_rtc, simplebus, am335x_rtc_driver, 0, 0);
 MODULE_VERSION(am335x_rtc, 1);
 MODULE_DEPEND(am335x_rtc, simplebus, 1, 1, 1);
 MODULE_DEPEND(am335x_rtc, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_scm.c b/sys/arm/ti/am335x/am335x_scm.c
index e72c14ba58ad..4fc603c46a61 100644
--- a/sys/arm/ti/am335x/am335x_scm.c
+++ b/sys/arm/ti/am335x/am335x_scm.c
@@ -191,8 +191,6 @@ static driver_t am335x_scm_driver = {
 	sizeof(struct am335x_scm_softc),
 };
 
-static devclass_t am335x_scm_devclass;
-
-DRIVER_MODULE(am335x_scm, ti_scm, am335x_scm_driver, am335x_scm_devclass, 0, 0);
+DRIVER_MODULE(am335x_scm, ti_scm, am335x_scm_driver, 0, 0);
 MODULE_VERSION(am335x_scm, 1);
 MODULE_DEPEND(am335x_scm, ti_scm_syscon, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_usb_phy.c b/sys/arm/ti/am335x/am335x_usb_phy.c
index 8fb54bd08f11..7e4c678a7152 100644
--- a/sys/arm/ti/am335x/am335x_usb_phy.c
+++ b/sys/arm/ti/am335x/am335x_usb_phy.c
@@ -111,9 +111,7 @@ static device_method_t ti_usb_phy_methods[] = {
 DEFINE_CLASS_1(ti_usb_phy, ti_usb_phy_driver, ti_usb_phy_methods,
     sizeof(struct ti_usb_phy_softc), simplebus_driver);
 
-static devclass_t ti_usb_phy_devclass;
-
-EARLY_DRIVER_MODULE(ti_usb_phy, simplebus, ti_usb_phy_driver,
-    ti_usb_phy_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
+EARLY_DRIVER_MODULE(ti_usb_phy, simplebus, ti_usb_phy_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
 MODULE_VERSION(ti_usb_phy, 1);
 MODULE_DEPEND(ti_usb_phy, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/tda19988.c b/sys/arm/ti/am335x/tda19988.c
index 0796da96bdd7..8f3a626b7c42 100644
--- a/sys/arm/ti/am335x/tda19988.c
+++ b/sys/arm/ti/am335x/tda19988.c
@@ -794,8 +794,6 @@ static driver_t tda_driver = {
 	sizeof(struct tda19988_softc),
 };
 
-static devclass_t tda_devclass;
-
-DRIVER_MODULE(tda, iicbus, tda_driver, tda_devclass, 0, 0);
+DRIVER_MODULE(tda, iicbus, tda_driver, 0, 0);
 MODULE_VERSION(tda, 1);
 MODULE_DEPEND(tda, iicbus, 1, 1, 1);
diff --git a/sys/arm/ti/clk/ti_clkctrl.c b/sys/arm/ti/clk/ti_clkctrl.c
index ee7d18fb0af8..deae42f0dd03 100644
--- a/sys/arm/ti/clk/ti_clkctrl.c
+++ b/sys/arm/ti/clk/ti_clkctrl.c
@@ -344,9 +344,7 @@ static device_method_t ti_clkctrl_methods[] = {
 DEFINE_CLASS_0(ti_clkctrl, ti_clkctrl_driver, ti_clkctrl_methods,
     sizeof(struct ti_clkctrl_softc));
 
-static devclass_t ti_clkctrl_devclass;
-
-EARLY_DRIVER_MODULE(ti_clkctrl, simplebus, ti_clkctrl_driver,
-ti_clkctrl_devclass, 0, 0, BUS_PASS_BUS+BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_clkctrl, simplebus, ti_clkctrl_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 
 MODULE_VERSION(ti_clkctrl, 1);
diff --git a/sys/arm/ti/clk/ti_divider_clock.c b/sys/arm/ti/clk/ti_divider_clock.c
index 753b5f535d29..91a3da569bbd 100644
--- a/sys/arm/ti/clk/ti_divider_clock.c
+++ b/sys/arm/ti/clk/ti_divider_clock.c
@@ -257,8 +257,6 @@ static device_method_t ti_divider_methods[] = {
 DEFINE_CLASS_0(ti_divider, ti_divider_driver, ti_divider_methods,
 	sizeof(struct ti_divider_softc));
 
-static devclass_t ti_divider_devclass;
-
-EARLY_DRIVER_MODULE(ti_divider, simplebus, ti_divider_driver,
-	ti_divider_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_divider, simplebus, ti_divider_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_divider, 1);
diff --git a/sys/arm/ti/clk/ti_dpll_clock.c b/sys/arm/ti/clk/ti_dpll_clock.c
index 91127c570c4d..77cfd5adbb99 100644
--- a/sys/arm/ti/clk/ti_dpll_clock.c
+++ b/sys/arm/ti/clk/ti_dpll_clock.c
@@ -368,8 +368,6 @@ static device_method_t ti_dpll_methods[] = {
 DEFINE_CLASS_0(ti_dpll, ti_dpll_driver, ti_dpll_methods,
 	sizeof(struct ti_dpll_softc));
 
-static devclass_t ti_dpll_devclass;
-
-EARLY_DRIVER_MODULE(ti_dpll, simplebus, ti_dpll_driver,
-	ti_dpll_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_dpll, simplebus, ti_dpll_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_dpll, 1);
diff --git a/sys/arm/ti/clk/ti_gate_clock.c b/sys/arm/ti/clk/ti_gate_clock.c
index b4fb65995e74..e3c1997e338c 100644
--- a/sys/arm/ti/clk/ti_gate_clock.c
+++ b/sys/arm/ti/clk/ti_gate_clock.c
@@ -259,8 +259,6 @@ static device_method_t ti_gate_methods[] = {
 DEFINE_CLASS_0(ti_gate, ti_gate_driver, ti_gate_methods,
 	sizeof(struct ti_gate_softc));
 
-static devclass_t ti_gate_devclass;
-
-EARLY_DRIVER_MODULE(ti_gate, simplebus, ti_gate_driver,
-	ti_gate_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_gate, simplebus, ti_gate_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_gate, 1);
diff --git a/sys/arm/ti/clk/ti_mux_clock.c b/sys/arm/ti/clk/ti_mux_clock.c
index bd232290e6a0..bb6d9af8173c 100644
--- a/sys/arm/ti/clk/ti_mux_clock.c
+++ b/sys/arm/ti/clk/ti_mux_clock.c
@@ -242,8 +242,6 @@ static device_method_t ti_mux_methods[] = {
 DEFINE_CLASS_0(ti_mux, ti_mux_driver, ti_mux_methods,
 	sizeof(struct ti_mux_softc));
 
-static devclass_t ti_mux_devclass;
-
-EARLY_DRIVER_MODULE(ti_mux, simplebus, ti_mux_driver,
-	ti_mux_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_mux, simplebus, ti_mux_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_mux, 1);
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index bac39be747e3..1dbd53b72004 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -209,9 +209,7 @@ static driver_t cpsw_driver = {
 	sizeof(struct cpsw_softc),
 };
 
-static devclass_t cpsw_devclass;
-
-DRIVER_MODULE(cpswss, simplebus, cpsw_driver, cpsw_devclass, 0, 0);
+DRIVER_MODULE(cpswss, simplebus, cpsw_driver, 0, 0);
 
 /* Port/Slave resources. */
 static device_method_t cpswp_methods[] = {
@@ -232,14 +230,12 @@ static driver_t cpswp_driver = {
 	sizeof(struct cpswp_softc),
 };
 
-static devclass_t cpswp_devclass;
-
 #ifdef CPSW_ETHERSWITCH
 DRIVER_MODULE(etherswitch, cpswss, etherswitch_driver, 0, 0);
 MODULE_DEPEND(cpswss, etherswitch, 1, 1, 1);
 #endif
 
-DRIVER_MODULE(cpsw, cpswss, cpswp_driver, cpswp_devclass, 0, 0);
+DRIVER_MODULE(cpsw, cpswss, cpswp_driver, 0, 0);
 DRIVER_MODULE(miibus, cpsw, miibus_driver, 0, 0);
 MODULE_DEPEND(cpsw, ether, 1, 1, 1);
 MODULE_DEPEND(cpsw, miibus, 1, 1, 1);
diff --git a/sys/arm/ti/omap4/omap4_gpio.c b/sys/arm/ti/omap4/omap4_gpio.c
index faf2339411b6..b4c9696aec8d 100644
--- a/sys/arm/ti/omap4/omap4_gpio.c
+++ b/sys/arm/ti/omap4/omap4_gpio.c
@@ -141,9 +141,7 @@ static device_method_t omap4_gpio_methods[] = {
 };
 
 extern driver_t ti_gpio_driver;
-static devclass_t omap4_gpio_devclass;
 
 DEFINE_CLASS_1(gpio, omap4_gpio_driver, omap4_gpio_methods,
     sizeof(struct ti_gpio_softc), ti_gpio_driver);
-DRIVER_MODULE(omap4_gpio, simplebus, omap4_gpio_driver, omap4_gpio_devclass,
-    0, 0);
+DRIVER_MODULE(omap4_gpio, simplebus, omap4_gpio_driver, 0, 0);
diff --git a/sys/arm/ti/omap4/omap4_prcm_clks.c b/sys/arm/ti/omap4/omap4_prcm_clks.c
index 56368e44059e..dda7442a500b 100644
--- a/sys/arm/ti/omap4/omap4_prcm_clks.c
+++ b/sys/arm/ti/omap4/omap4_prcm_clks.c
@@ -1497,8 +1497,6 @@ static driver_t omap4_prcm_driver = {
 	sizeof(struct omap4_prcm_softc),
 };
 
-static devclass_t omap4_prcm_devclass;
-
-EARLY_DRIVER_MODULE(omap4_prcm, simplebus, omap4_prcm_driver,
-    omap4_prcm_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(omap4_prcm, simplebus, omap4_prcm_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(omap4_prcm, 1);
diff --git a/sys/arm/ti/omap4/omap4_wugen.c b/sys/arm/ti/omap4/omap4_wugen.c
index 539e4f905b30..925262f8f1d5 100644
--- a/sys/arm/ti/omap4/omap4_wugen.c
+++ b/sys/arm/ti/omap4/omap4_wugen.c
@@ -241,9 +241,8 @@ static device_method_t omap4_wugen_methods[] = {
 #endif
 	DEVMETHOD_END
 };
-devclass_t omap4_wugen_devclass;
+
 DEFINE_CLASS_0(omap4_wugen, omap4_wugen_driver, omap4_wugen_methods,
     sizeof(struct omap4_wugen_sc));
-EARLY_DRIVER_MODULE(omap4_wugen, simplebus, omap4_wugen_driver,
-    omap4_wugen_devclass, NULL, NULL,
+EARLY_DRIVER_MODULE(omap4_wugen, simplebus, omap4_wugen_driver, NULL, NULL,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE + 1);
diff --git a/sys/arm/ti/ti_adc.c b/sys/arm/ti/ti_adc.c
index 2a0671bb0759..31869c50a228 100644
--- a/sys/arm/ti/ti_adc.c
+++ b/sys/arm/ti/ti_adc.c
@@ -957,9 +957,7 @@ static driver_t ti_adc_driver = {
 	sizeof(struct ti_adc_softc),
 };
 
-static devclass_t ti_adc_devclass;
-
-DRIVER_MODULE(ti_adc, simplebus, ti_adc_driver, ti_adc_devclass, 0, 0);
+DRIVER_MODULE(ti_adc, simplebus, ti_adc_driver, 0, 0);
 MODULE_VERSION(ti_adc, 1);
 MODULE_DEPEND(ti_adc, simplebus, 1, 1, 1);
 MODULE_DEPEND(ti_adc, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/ti_edma3.c b/sys/arm/ti/ti_edma3.c
index 436f983baa5b..ef0891b1bd1a 100644
--- a/sys/arm/ti/ti_edma3.c
+++ b/sys/arm/ti/ti_edma3.c
@@ -216,9 +216,8 @@ static driver_t ti_edma3_driver = {
 	ti_edma3_methods,
 	sizeof(struct ti_edma3_softc),
 };
-static devclass_t ti_edma3_devclass;
 
-DRIVER_MODULE(ti_edma3, simplebus, ti_edma3_driver, ti_edma3_devclass, 0, 0);
+DRIVER_MODULE(ti_edma3, simplebus, ti_edma3_driver, 0, 0);
 MODULE_DEPEND(ti_edma3, ti_sysc, 1, 1, 1);
 
 static void
diff --git a/sys/arm/ti/ti_i2c.c b/sys/arm/ti/ti_i2c.c
index 88845ffca853..0eb8be5eda18 100644
--- a/sys/arm/ti/ti_i2c.c
+++ b/sys/arm/ti/ti_i2c.c
@@ -968,9 +968,7 @@ static driver_t ti_i2c_driver = {
 	sizeof(struct ti_i2c_softc),
 };
 
-static devclass_t ti_i2c_devclass;
-
-DRIVER_MODULE(ti_iic, simplebus, ti_i2c_driver, ti_i2c_devclass, 0, 0);
+DRIVER_MODULE(ti_iic, simplebus, ti_i2c_driver, 0, 0);
 DRIVER_MODULE(iicbus, ti_iic, iicbus_driver, 0, 0);
 
 MODULE_DEPEND(ti_iic, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/ti_mbox.c b/sys/arm/ti/ti_mbox.c
index 93364aa5093c..9a14bb6d38d4 100644
--- a/sys/arm/ti/ti_mbox.c
+++ b/sys/arm/ti/ti_mbox.c
@@ -99,9 +99,7 @@ static driver_t ti_mbox_driver = {
 	sizeof(struct ti_mbox_softc)
 };
 
-static devclass_t ti_mbox_devclass;
-
-DRIVER_MODULE(ti_mbox, simplebus, ti_mbox_driver, ti_mbox_devclass, 0, 0);
+DRIVER_MODULE(ti_mbox, simplebus, ti_mbox_driver, 0, 0);
 MODULE_DEPEND(ti_mbox, ti_sysc, 1, 1, 1);
 
 static __inline uint32_t
diff --git a/sys/arm/ti/ti_omap4_cm.c b/sys/arm/ti/ti_omap4_cm.c
index 795bd2b75206..e25f010a6afe 100644
--- a/sys/arm/ti/ti_omap4_cm.c
+++ b/sys/arm/ti/ti_omap4_cm.c
@@ -141,10 +141,8 @@ static device_method_t ti_omap4_cm_methods[] = {
 DEFINE_CLASS_1(ti_omap4_cm, ti_omap4_cm_driver, ti_omap4_cm_methods,
     sizeof(struct ti_omap4_cm_softc), simplebus_driver);
 
-static devclass_t ti_omap4_cm_devclass;
+EARLY_DRIVER_MODULE(ti_omap4_cm, simplebus, ti_omap4_cm_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
 
-EARLY_DRIVER_MODULE(ti_omap4_cm, simplebus, ti_omap4_cm_driver,
-ti_omap4_cm_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
-
-EARLY_DRIVER_MODULE(ti_omap4_cm, ofwbus, ti_omap4_cm_driver,
-ti_omap4_cm_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
+EARLY_DRIVER_MODULE(ti_omap4_cm, ofwbus, ti_omap4_cm_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
diff --git a/sys/arm/ti/ti_pinmux.c b/sys/arm/ti/ti_pinmux.c
index 58d3b93c46b5..a8c837b34b40 100644
--- a/sys/arm/ti/ti_pinmux.c
+++ b/sys/arm/ti/ti_pinmux.c
@@ -453,8 +453,6 @@ static driver_t ti_pinmux_driver = {
 	sizeof(struct ti_pinmux_softc),
 };
 
-static devclass_t ti_pinmux_devclass;
-
-DRIVER_MODULE(ti_pinmux, simplebus, ti_pinmux_driver, ti_pinmux_devclass, 0, 0);
+DRIVER_MODULE(ti_pinmux, simplebus, ti_pinmux_driver, 0, 0);
 MODULE_VERSION(ti_pinmux, 1);
 MODULE_DEPEND(ti_pinmux, ti_scm, 1, 1, 1);
diff --git a/sys/arm/ti/ti_prcm.c b/sys/arm/ti/ti_prcm.c
index 2664b8f71ec4..29dccdccc002 100644
--- a/sys/arm/ti/ti_prcm.c
+++ b/sys/arm/ti/ti_prcm.c
@@ -275,12 +275,9 @@ static device_method_t ti_prcm_methods[] = {
 DEFINE_CLASS_1(ti_prcm, ti_prcm_driver, ti_prcm_methods,
     sizeof(struct ti_prcm_softc), simplebus_driver);
 
-static devclass_t ti_prcm_devclass;
-
-EARLY_DRIVER_MODULE(ti_prcm, ofwbus, ti_prcm_driver,
-	ti_prcm_devclass, 0, 0, BUS_PASS_BUS);
-EARLY_DRIVER_MODULE(ti_prcm, simplebus, ti_prcm_driver,
-	ti_prcm_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_prcm, ofwbus, ti_prcm_driver, 0, 0, BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(ti_prcm, simplebus, ti_prcm_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_prcm, 1);
 MODULE_DEPEND(ti_prcm, ti_scm, 1, 1, 1);
 
diff --git a/sys/arm/ti/ti_prm.c b/sys/arm/ti/ti_prm.c
index 64edcf8c28f5..cae001f7613b 100644
--- a/sys/arm/ti/ti_prm.c
+++ b/sys/arm/ti/ti_prm.c
@@ -196,9 +196,7 @@ static device_method_t ti_prm_methods[] = {
 DEFINE_CLASS_1(ti_prm, ti_prm_driver, ti_prm_methods,
     sizeof(struct ti_prm_softc), simplebus_driver);
 
-static devclass_t ti_prm_devclass;
-
-EARLY_DRIVER_MODULE(ti_prm, simplebus, ti_prm_driver,
-    ti_prm_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_prm, simplebus, ti_prm_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_prm, 1);
 MODULE_DEPEND(ti_prm, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
index 296c1efa86fc..f386c1b719ec 100644
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -161,9 +161,7 @@ static driver_t ti_pruss_driver = {
 	sizeof(struct ti_pruss_softc)
 };
 
-static devclass_t ti_pruss_devclass;
-
-DRIVER_MODULE(ti_pruss, simplebus, ti_pruss_driver, ti_pruss_devclass, 0, 0);
+DRIVER_MODULE(ti_pruss, simplebus, ti_pruss_driver, 0, 0);
 MODULE_DEPEND(ti_pruss, ti_sysc, 1, 1, 1);
 MODULE_DEPEND(ti_pruss, ti_prm, 1, 1, 1);
 
diff --git a/sys/arm/ti/ti_scm.c b/sys/arm/ti/ti_scm.c
index 9d3da5e92b3b..a1fd0d6a2e74 100644
--- a/sys/arm/ti/ti_scm.c
+++ b/sys/arm/ti/ti_scm.c
@@ -152,9 +152,7 @@ static device_method_t ti_scm_methods[] = {
 DEFINE_CLASS_1(ti_scm, ti_scm_driver, ti_scm_methods,
     sizeof(struct ti_scm_softc), simplebus_driver);
 
-static devclass_t ti_scm_devclass;
-
-EARLY_DRIVER_MODULE(ti_scm, simplebus, ti_scm_driver,
-    ti_scm_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
+EARLY_DRIVER_MODULE(ti_scm, simplebus, ti_scm_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
 MODULE_VERSION(ti_scm, 1);
 MODULE_DEPEND(ti_scm, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/ti_scm_syscon.c b/sys/arm/ti/ti_scm_syscon.c
index b57fbc0fb3f8..4a001d8ef477 100644
--- a/sys/arm/ti/ti_scm_syscon.c
+++ b/sys/arm/ti/ti_scm_syscon.c
@@ -289,9 +289,7 @@ static device_method_t ti_scm_syscon_methods[] = {
 DEFINE_CLASS_1(ti_scm_syscon, ti_scm_syscon_driver, ti_scm_syscon_methods,
     sizeof(struct ti_scm_syscon_softc), simplebus_driver);
 
-static devclass_t ti_scm_syscon_devclass;
-
-EARLY_DRIVER_MODULE(ti_scm_syscon, simplebus, ti_scm_syscon_driver,
-    ti_scm_syscon_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ti_scm_syscon, simplebus, ti_scm_syscon_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ti_scm_syscon, 1);
 MODULE_DEPEND(ti_scm_syscon, ti_scm, 1, 1, 1);
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index 8554a562ad84..7b44b0958717 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -752,16 +752,13 @@ static device_method_t ti_sdhci_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ti_sdhci_devclass;
-
 static driver_t ti_sdhci_driver = {
 	"sdhci_ti",
 	ti_sdhci_methods,
 	sizeof(struct ti_sdhci_softc),
 };
 
-DRIVER_MODULE(sdhci_ti, simplebus, ti_sdhci_driver, ti_sdhci_devclass, NULL,
-    NULL);
+DRIVER_MODULE(sdhci_ti, simplebus, ti_sdhci_driver, NULL, NULL);
 MODULE_DEPEND(sdhci_ti, ti_sysc, 1, 1, 1);
 SDHCI_DEPEND(sdhci_ti);
 
diff --git a/sys/arm/ti/ti_sdma.c b/sys/arm/ti/ti_sdma.c
index 9da33d47df82..3e01c437d5af 100644
--- a/sys/arm/ti/ti_sdma.c
+++ b/sys/arm/ti/ti_sdma.c
@@ -1242,7 +1242,6 @@ static driver_t ti_sdma_driver = {
 	ti_sdma_methods,
 	sizeof(struct ti_sdma_softc),
 };
-static devclass_t ti_sdma_devclass;
 
-DRIVER_MODULE(ti_sdma, simplebus, ti_sdma_driver, ti_sdma_devclass, 0, 0);
+DRIVER_MODULE(ti_sdma, simplebus, ti_sdma_driver, 0, 0);
 MODULE_DEPEND(ti_sdma, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/ti_spi.c b/sys/arm/ti/ti_spi.c
index e51d3de353bd..7c908ab10434 100644
--- a/sys/arm/ti/ti_spi.c
+++ b/sys/arm/ti/ti_spi.c
@@ -565,13 +565,11 @@ static device_method_t ti_spi_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ti_spi_devclass;
-
 static driver_t ti_spi_driver = {
 	"spi",
 	ti_spi_methods,
 	sizeof(struct ti_spi_softc),
 };
 
-DRIVER_MODULE(ti_spi, simplebus, ti_spi_driver, ti_spi_devclass, 0, 0);
+DRIVER_MODULE(ti_spi, simplebus, ti_spi_driver, 0, 0);
 MODULE_DEPEND(ti_spi, ti_sysc, 1, 1, 1);
diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c
index 3aad5fd0730d..d6e23234b39c 100644
--- a/sys/arm/ti/ti_sysc.c
+++ b/sys/arm/ti/ti_sysc.c
@@ -613,7 +613,5 @@ static device_method_t ti_sysc_methods[] = {
 DEFINE_CLASS_1(ti_sysc, ti_sysc_driver, ti_sysc_methods,
 	sizeof(struct ti_sysc_softc), simplebus_driver);
 
-static devclass_t ti_sysc_devclass;
-
-EARLY_DRIVER_MODULE(ti_sysc, simplebus, ti_sysc_driver,
-    ti_sysc_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
+EARLY_DRIVER_MODULE(ti_sysc, simplebus, ti_sysc_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_FIRST);
diff --git a/sys/arm/ti/ti_wdt.c b/sys/arm/ti/ti_wdt.c
index 29ae41eac531..46be0008c35d 100644
--- a/sys/arm/ti/ti_wdt.c
+++ b/sys/arm/ti/ti_wdt.c
@@ -89,9 +89,7 @@ static driver_t ti_wdt_driver = {
 	sizeof(struct ti_wdt_softc)
 };
 
-static devclass_t ti_wdt_devclass;
-
-DRIVER_MODULE(ti_wdt, simplebus, ti_wdt_driver, ti_wdt_devclass, 0, 0);
+DRIVER_MODULE(ti_wdt, simplebus, ti_wdt_driver, 0, 0);
 MODULE_DEPEND(ti_wdt, ti_sysc, 1, 1, 1);
 
 static __inline uint32_t
diff --git a/sys/arm/ti/twl/twl.c b/sys/arm/ti/twl/twl.c
index c7755b524f0a..9dead053a8a7 100644
--- a/sys/arm/ti/twl/twl.c
+++ b/sys/arm/ti/twl/twl.c
@@ -452,7 +452,6 @@ static driver_t twl_driver = {
 	twl_methods,
 	sizeof(struct twl_softc),
 };
-static devclass_t twl_devclass;
 
-DRIVER_MODULE(twl, iicbus, twl_driver, twl_devclass, 0, 0);
+DRIVER_MODULE(twl, iicbus, twl_driver, 0, 0);
 MODULE_VERSION(twl, 1);
diff --git a/sys/arm/ti/twl/twl_clks.c b/sys/arm/ti/twl/twl_clks.c
index fee2f2226a32..bdeec0b8b4e8 100644
--- a/sys/arm/ti/twl/twl_clks.c
+++ b/sys/arm/ti/twl/twl_clks.c
@@ -645,7 +645,5 @@ static driver_t twl_clks_driver = {
 	sizeof(struct twl_clks_softc),
 };
 
-static devclass_t twl_clks_devclass;
-
-DRIVER_MODULE(twl_clks, twl, twl_clks_driver, twl_clks_devclass, 0, 0);
+DRIVER_MODULE(twl_clks, twl, twl_clks_driver, 0, 0);
 MODULE_VERSION(twl_clks, 1);
diff --git a/sys/arm/ti/twl/twl_vreg.c b/sys/arm/ti/twl/twl_vreg.c
index 6d78f053624b..70a5e7dfed41 100644
--- a/sys/arm/ti/twl/twl_vreg.c
+++ b/sys/arm/ti/twl/twl_vreg.c
@@ -1024,7 +1024,5 @@ static driver_t twl_vreg_driver = {
 	sizeof(struct twl_vreg_softc),
 };
 
-static devclass_t twl_vreg_devclass;
-
-DRIVER_MODULE(twl_vreg, twl, twl_vreg_driver, twl_vreg_devclass, 0, 0);
+DRIVER_MODULE(twl_vreg, twl, twl_vreg_driver, 0, 0);
 MODULE_VERSION(twl_vreg, 1);
diff --git a/sys/arm/ti/usb/omap_ehci.c b/sys/arm/ti/usb/omap_ehci.c
index 8b1bb700bf43..f1a4911a3a24 100644
--- a/sys/arm/ti/usb/omap_ehci.c
+++ b/sys/arm/ti/usb/omap_ehci.c
@@ -463,6 +463,4 @@ static driver_t ehci_driver = {
 	sizeof(struct omap_ehci_softc),
 };
 
-static devclass_t ehci_devclass;
-
-DRIVER_MODULE(omap_ehci, omap_uhh, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(omap_ehci, omap_uhh, ehci_driver, 0, 0);
diff --git a/sys/arm/ti/usb/omap_host.c b/sys/arm/ti/usb/omap_host.c
index c73ec1319042..a01a22981fc2 100644
--- a/sys/arm/ti/usb/omap_host.c
+++ b/sys/arm/ti/usb/omap_host.c
@@ -463,5 +463,4 @@ static device_method_t omap_uhh_methods[] = {
 
 DEFINE_CLASS_1(omap_uhh, omap_uhh_driver, omap_uhh_methods,
     sizeof(struct omap_uhh_softc), simplebus_driver);
-static devclass_t omap_uhh_devclass;
-DRIVER_MODULE(omap_uhh, simplebus, omap_uhh_driver, omap_uhh_devclass, 0, 0);
+DRIVER_MODULE(omap_uhh, simplebus, omap_uhh_driver, 0, 0);
diff --git a/sys/arm/ti/usb/omap_tll.c b/sys/arm/ti/usb/omap_tll.c
index 6737b23b2d07..2f5646982b32 100644
--- a/sys/arm/ti/usb/omap_tll.c
+++ b/sys/arm/ti/usb/omap_tll.c
@@ -356,6 +356,4 @@ static driver_t omap_tll_driver = {
 	sizeof(struct omap_tll_softc),
 };
 
-static devclass_t omap_tll_devclass;
-
-DRIVER_MODULE(omap_tll, simplebus, omap_tll_driver, omap_tll_devclass, 0, 0);
+DRIVER_MODULE(omap_tll, simplebus, omap_tll_driver, 0, 0);