git: a3b866cb2991 - main - arm mv: Remove unused devclass arguments to DRIVER_MODULE.

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Mon, 09 May 2022 21:47:50 UTC
The branch main has been updated by jhb:

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

commit a3b866cb2991f32b57c135937c31b46c9605c97f
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 mv: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/arm/mv/a37x0_gpio.c                     | 5 ++---
 sys/arm/mv/a37x0_iic.c                      | 4 +---
 sys/arm/mv/a37x0_spi.c                      | 4 +---
 sys/arm/mv/armada/thermal.c                 | 8 ++------
 sys/arm/mv/armada/wdt.c                     | 3 +--
 sys/arm/mv/armada38x/armada38x_rtc.c        | 4 +---
 sys/arm/mv/armada38x/pmsu.c                 | 6 ++----
 sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c | 6 ++----
 sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c | 6 ++----
 sys/arm/mv/clk/a37x0_tbg.c                  | 6 ++----
 sys/arm/mv/clk/a37x0_xtal.c                 | 6 ++----
 sys/arm/mv/gpio.c                           | 4 +---
 sys/arm/mv/ic.c                             | 4 +---
 sys/arm/mv/mpic.c                           | 4 +---
 sys/arm/mv/mv_ap806_clock.c                 | 6 ++----
 sys/arm/mv/mv_ap806_gicp.c                  | 6 ++----
 sys/arm/mv/mv_ap806_sei.c                   | 6 ++----
 sys/arm/mv/mv_cp110_clock.c                 | 6 ++----
 sys/arm/mv/mv_cp110_icu.c                   | 6 ++----
 sys/arm/mv/mv_cp110_icu_bus.c               | 5 ++---
 sys/arm/mv/mv_pci.c                         | 6 ++----
 sys/arm/mv/mv_pci_ctrl.c                    | 4 +---
 sys/arm/mv/mv_spi.c                         | 4 +---
 sys/arm/mv/mv_thermal.c                     | 5 +----
 sys/arm/mv/mvebu_gpio.c                     | 4 +---
 sys/arm/mv/mvebu_pinctrl.c                  | 6 ++----
 sys/arm/mv/rtc.c                            | 3 +--
 sys/arm/mv/timer.c                          | 4 +---
 28 files changed, 43 insertions(+), 98 deletions(-)

diff --git a/sys/arm/mv/a37x0_gpio.c b/sys/arm/mv/a37x0_gpio.c
index 6e9613b1ef7d..49ad2542eb99 100644
--- a/sys/arm/mv/a37x0_gpio.c
+++ b/sys/arm/mv/a37x0_gpio.c
@@ -331,12 +331,11 @@ static device_method_t a37x0_gpio_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t a37x0_gpio_devclass;
 static driver_t a37x0_gpio_driver = {
 	"gpio",
 	a37x0_gpio_methods,
 	sizeof(struct a37x0_gpio_softc),
 };
 
-EARLY_DRIVER_MODULE(a37x0_gpio, simple_mfd, a37x0_gpio_driver,
-    a37x0_gpio_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
+EARLY_DRIVER_MODULE(a37x0_gpio, simple_mfd, a37x0_gpio_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
diff --git a/sys/arm/mv/a37x0_iic.c b/sys/arm/mv/a37x0_iic.c
index b92506c6dcad..72ca1a9794c5 100644
--- a/sys/arm/mv/a37x0_iic.c
+++ b/sys/arm/mv/a37x0_iic.c
@@ -472,8 +472,6 @@ static device_method_t a37x0_iic_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t a37x0_iic_devclass;
-
 static driver_t a37x0_iic_driver = {
 	"iichb",
 	a37x0_iic_methods,
@@ -481,4 +479,4 @@ static driver_t a37x0_iic_driver = {
 };
 
 DRIVER_MODULE(iicbus, a37x0_iic, iicbus_driver, 0, 0);
-DRIVER_MODULE(a37x0_iic, simplebus, a37x0_iic_driver, a37x0_iic_devclass, 0, 0);
+DRIVER_MODULE(a37x0_iic, simplebus, a37x0_iic_driver, 0, 0);
diff --git a/sys/arm/mv/a37x0_spi.c b/sys/arm/mv/a37x0_spi.c
index 1fdb6735dd7f..3d8943bc9c44 100644
--- a/sys/arm/mv/a37x0_spi.c
+++ b/sys/arm/mv/a37x0_spi.c
@@ -483,12 +483,10 @@ static device_method_t a37x0_spi_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t a37x0_spi_devclass;
-
 static driver_t a37x0_spi_driver = {
 	"spi",
 	a37x0_spi_methods,
 	sizeof(struct a37x0_spi_softc),
 };
 
-DRIVER_MODULE(a37x0_spi, simplebus, a37x0_spi_driver, a37x0_spi_devclass, 0, 0);
+DRIVER_MODULE(a37x0_spi, simplebus, a37x0_spi_driver, 0, 0);
diff --git a/sys/arm/mv/armada/thermal.c b/sys/arm/mv/armada/thermal.c
index a2f6ed78c487..61e34d9a38a1 100644
--- a/sys/arm/mv/armada/thermal.c
+++ b/sys/arm/mv/armada/thermal.c
@@ -123,12 +123,8 @@ static driver_t	armada_thermal_driver = {
 	sizeof(struct armada_thermal_softc)
 };
 
-static devclass_t armada_thermal_devclass;
-
-DRIVER_MODULE(armada_thermal, simplebus, armada_thermal_driver,
-        armada_thermal_devclass, 0, 0);
-DRIVER_MODULE(armada_thermal, ofwbus, armada_thermal_driver,
-        armada_thermal_devclass, 0, 0);
+DRIVER_MODULE(armada_thermal, simplebus, armada_thermal_driver, 0, 0);
+DRIVER_MODULE(armada_thermal, ofwbus, armada_thermal_driver, 0, 0);
 
 static int
 armada_thermal_probe(device_t dev)
diff --git a/sys/arm/mv/armada/wdt.c b/sys/arm/mv/armada/wdt.c
index 920ff4d506bb..7e0887e35138 100644
--- a/sys/arm/mv/armada/wdt.c
+++ b/sys/arm/mv/armada/wdt.c
@@ -140,9 +140,8 @@ static driver_t mv_wdt_driver = {
 	sizeof(struct mv_wdt_softc),
 };
 
-static devclass_t mv_wdt_devclass;
+DRIVER_MODULE(wdt, simplebus, mv_wdt_driver, 0, 0);
 
-DRIVER_MODULE(wdt, simplebus, mv_wdt_driver, mv_wdt_devclass, 0, 0);
 static int
 mv_wdt_probe(device_t dev)
 {
diff --git a/sys/arm/mv/armada38x/armada38x_rtc.c b/sys/arm/mv/armada38x/armada38x_rtc.c
index d6f2073b414a..073775e86388 100644
--- a/sys/arm/mv/armada38x/armada38x_rtc.c
+++ b/sys/arm/mv/armada38x/armada38x_rtc.c
@@ -148,9 +148,7 @@ static struct ofw_compat_data mv_rtc_compat[] = {
 	{NULL,				0},
 };
 
-static devclass_t mv_rtc_devclass;
-
-DRIVER_MODULE(a38x_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0);
+DRIVER_MODULE(a38x_rtc, simplebus, mv_rtc_driver, 0, 0);
 
 static void
 mv_rtc_reset(device_t dev)
diff --git a/sys/arm/mv/armada38x/pmsu.c b/sys/arm/mv/armada38x/pmsu.c
index 7df368d0c051..e3e99697d1ef 100644
--- a/sys/arm/mv/armada38x/pmsu.c
+++ b/sys/arm/mv/armada38x/pmsu.c
@@ -78,10 +78,8 @@ static driver_t pmsu_driver = {
 	sizeof(struct pmsu_softc)
 };
 
-static devclass_t pmsu_devclass;
-
-DRIVER_MODULE(pmsu, simplebus, pmsu_driver, pmsu_devclass, 0, 0);
-DRIVER_MODULE(pmsu, ofwbus, pmsu_driver, pmsu_devclass, 0, 0);
+DRIVER_MODULE(pmsu, simplebus, pmsu_driver, 0, 0);
+DRIVER_MODULE(pmsu, ofwbus, pmsu_driver, 0, 0);
 
 static int
 pmsu_probe(device_t dev)
diff --git a/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
index f0cf1247e741..c92fb823d23d 100644
--- a/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
@@ -132,10 +132,8 @@ static driver_t a37x0_nb_periph_driver = {
 	sizeof(struct a37x0_periph_clk_softc)
 };
 
-devclass_t a37x0_nb_periph_devclass;
-
-EARLY_DRIVER_MODULE(a37x0_nb_periph, simplebus, a37x0_nb_periph_driver,
-    a37x0_nb_periph_devclass, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(a37x0_nb_periph, simplebus, a37x0_nb_periph_driver, 0, 0,
+    BUS_PASS_TIMER + BUS_PASS_ORDER_LATE);
 
 static int
 a37x0_nb_periph_clk_attach(device_t dev)
diff --git a/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
index 4c6fe38b7040..0b3b5876e2f9 100644
--- a/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
@@ -101,10 +101,8 @@ static driver_t a37x0_sb_periph_driver = {
 	sizeof(struct a37x0_periph_clk_softc)
 };
 
-devclass_t a37x0_sb_periph_devclass;
-
-EARLY_DRIVER_MODULE(a37x0_sb_periph, simplebus, a37x0_sb_periph_driver,
-    a37x0_sb_periph_devclass, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(a37x0_sb_periph, simplebus, a37x0_sb_periph_driver, 0, 0,
+    BUS_PASS_TIMER + BUS_PASS_ORDER_LATE);
 
 static int
 a37x0_sb_periph_clk_attach(device_t dev)
diff --git a/sys/arm/mv/clk/a37x0_tbg.c b/sys/arm/mv/clk/a37x0_tbg.c
index 289345ca7cbb..39335d6916c5 100644
--- a/sys/arm/mv/clk/a37x0_tbg.c
+++ b/sys/arm/mv/clk/a37x0_tbg.c
@@ -91,8 +91,6 @@ static const struct a37x0_tbg_def tbg[NUM_TBG] = {
 	{"TBG-B-S", TBG_B_REFDIV, TBG_B_FBDIV, TBG_CTRL1, TBG_B_VCODIV_SEL, 25}
 };
 
-static devclass_t a37x0_tbg_devclass;
-
 static int a37x0_tbg_read_4(device_t, bus_addr_t, uint32_t *);
 static int a37x0_tbg_attach(device_t);
 static int a37x0_tbg_detach(device_t);
@@ -114,8 +112,8 @@ static driver_t a37x0_tbg_driver = {
 	sizeof(struct a37x0_tbg_softc)
 };
 
-EARLY_DRIVER_MODULE(a37x0_tbg, simplebus, a37x0_tbg_driver,
-    a37x0_tbg_devclass, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(a37x0_tbg, simplebus, a37x0_tbg_driver, 0, 0,
+    BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
 
 static int
 a37x0_tbg_read_4(device_t dev, bus_addr_t offset, uint32_t *val)
diff --git a/sys/arm/mv/clk/a37x0_xtal.c b/sys/arm/mv/clk/a37x0_xtal.c
index 4f60a2a1ef25..34a28ce431db 100644
--- a/sys/arm/mv/clk/a37x0_xtal.c
+++ b/sys/arm/mv/clk/a37x0_xtal.c
@@ -57,8 +57,6 @@ struct a37x0_xtal_softc {
 	struct clkdom		*clkdom;
 };
 
-static devclass_t a37x0_xtal_devclass;
-
 static int a37x0_xtal_attach(device_t dev);
 static int a37x0_xtal_detach(device_t dev);
 static int a37x0_xtal_probe(device_t dev);
@@ -76,8 +74,8 @@ static driver_t a37x0_xtal_driver = {
 	sizeof(struct a37x0_xtal_softc)
 };
 
-EARLY_DRIVER_MODULE(a37x0_xtal, simplebus, a37x0_xtal_driver,
-    a37x0_xtal_devclass, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_EARLY);
+EARLY_DRIVER_MODULE(a37x0_xtal, simplebus, a37x0_xtal_driver, 0, 0,
+    BUS_PASS_TIMER + BUS_PASS_ORDER_EARLY);
 
 static int
 a37x0_xtal_attach(device_t dev)
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index c8f5a8c2aaf3..652ee845e675 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -187,9 +187,7 @@ static driver_t mv_gpio_driver = {
 	sizeof(struct mv_gpio_softc),
 };
 
-static devclass_t mv_gpio_devclass;
-
-EARLY_DRIVER_MODULE(mv_gpio, simplebus, mv_gpio_driver, mv_gpio_devclass, 0, 0,
+EARLY_DRIVER_MODULE(mv_gpio, simplebus, mv_gpio_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
 
 struct ofw_compat_data compat_data[] = {
diff --git a/sys/arm/mv/ic.c b/sys/arm/mv/ic.c
index ed99ee646aec..0b3db73b28ee 100644
--- a/sys/arm/mv/ic.c
+++ b/sys/arm/mv/ic.c
@@ -146,9 +146,7 @@ static driver_t mv_ic_driver = {
 	sizeof(struct mv_ic_softc),
 };
 
-static devclass_t mv_ic_devclass;
-
-DRIVER_MODULE(ic, simplebus, mv_ic_driver, mv_ic_devclass, 0, 0);
+DRIVER_MODULE(ic, simplebus, mv_ic_driver, 0, 0);
 
 int
 arm_get_next_irq(int last)
diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c
index e235dcd07c7c..785faaa09b55 100644
--- a/sys/arm/mv/mpic.c
+++ b/sys/arm/mv/mpic.c
@@ -397,9 +397,7 @@ static driver_t mv_mpic_driver = {
 	sizeof(struct mv_mpic_softc),
 };
 
-static devclass_t mv_mpic_devclass;
-
-EARLY_DRIVER_MODULE(mpic, simplebus, mv_mpic_driver, mv_mpic_devclass, 0, 0,
+EARLY_DRIVER_MODULE(mpic, simplebus, mv_mpic_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
 
 static void
diff --git a/sys/arm/mv/mv_ap806_clock.c b/sys/arm/mv/mv_ap806_clock.c
index 56041a48d312..41a72496c411 100644
--- a/sys/arm/mv/mv_ap806_clock.c
+++ b/sys/arm/mv/mv_ap806_clock.c
@@ -221,13 +221,11 @@ static device_method_t mv_ap806_clock_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_ap806_clock_devclass;
-
 static driver_t mv_ap806_clock_driver = {
 	"mv_ap806_clock",
 	mv_ap806_clock_methods,
 	sizeof(struct mv_ap806_clock_softc),
 };
 
-EARLY_DRIVER_MODULE(mv_ap806_clock, simplebus, mv_ap806_clock_driver,
-    mv_ap806_clock_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(mv_ap806_clock, simplebus, mv_ap806_clock_driver, 0, 0,
+    BUS_PASS_RESOURCE + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/mv/mv_ap806_gicp.c b/sys/arm/mv/mv_ap806_gicp.c
index ab0c540bf3f8..cbe5b6152d53 100644
--- a/sys/arm/mv/mv_ap806_gicp.c
+++ b/sys/arm/mv/mv_ap806_gicp.c
@@ -442,13 +442,11 @@ static device_method_t mv_ap806_gicp_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_ap806_gicp_devclass;
-
 static driver_t mv_ap806_gicp_driver = {
 	"mv_ap806_gicp",
 	mv_ap806_gicp_methods,
 	sizeof(struct mv_ap806_gicp_softc),
 };
 
-EARLY_DRIVER_MODULE(mv_ap806_gicp, simplebus, mv_ap806_gicp_driver,
-    mv_ap806_gicp_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(mv_ap806_gicp, simplebus, mv_ap806_gicp_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/mv/mv_ap806_sei.c b/sys/arm/mv/mv_ap806_sei.c
index 7d6291cae5ba..e5732d70e625 100644
--- a/sys/arm/mv/mv_ap806_sei.c
+++ b/sys/arm/mv/mv_ap806_sei.c
@@ -498,13 +498,11 @@ static device_method_t mv_ap806_sei_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_ap806_sei_devclass;
-
 static driver_t mv_ap806_sei_driver = {
 	"mv_ap806_sei",
 	mv_ap806_sei_methods,
 	sizeof(struct mv_ap806_sei_softc),
 };
 
-EARLY_DRIVER_MODULE(mv_ap806_sei, simplebus, mv_ap806_sei_driver,
-    mv_ap806_sei_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(mv_ap806_sei, simplebus, mv_ap806_sei_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/mv/mv_cp110_clock.c b/sys/arm/mv/mv_cp110_clock.c
index 84519b870d9a..eb7603a9d683 100644
--- a/sys/arm/mv/mv_cp110_clock.c
+++ b/sys/arm/mv/mv_cp110_clock.c
@@ -358,13 +358,11 @@ static device_method_t mv_cp110_clock_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_cp110_clock_devclass;
-
 static driver_t mv_cp110_clock_driver = {
 	"mv_cp110_clock",
 	mv_cp110_clock_methods,
 	sizeof(struct mv_cp110_clock_softc),
 };
 
-EARLY_DRIVER_MODULE(mv_cp110_clock, simplebus, mv_cp110_clock_driver,
-    mv_cp110_clock_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(mv_cp110_clock, simplebus, mv_cp110_clock_driver, 0, 0,
+    BUS_PASS_RESOURCE + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c
index c783043ab1df..8836dbde08ef 100644
--- a/sys/arm/mv/mv_cp110_icu.c
+++ b/sys/arm/mv/mv_cp110_icu.c
@@ -455,13 +455,11 @@ static device_method_t mv_cp110_icu_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_cp110_icu_devclass;
-
 static driver_t mv_cp110_icu_driver = {
 	"mv_cp110_icu",
 	mv_cp110_icu_methods,
 	sizeof(struct mv_cp110_icu_softc),
 };
 
-EARLY_DRIVER_MODULE(mv_cp110_icu, mv_cp110_icu_bus, mv_cp110_icu_driver,
-    mv_cp110_icu_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
+EARLY_DRIVER_MODULE(mv_cp110_icu, mv_cp110_icu_bus, mv_cp110_icu_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
diff --git a/sys/arm/mv/mv_cp110_icu_bus.c b/sys/arm/mv/mv_cp110_icu_bus.c
index c1c5f4ae7891..9b7efe823c88 100644
--- a/sys/arm/mv/mv_cp110_icu_bus.c
+++ b/sys/arm/mv/mv_cp110_icu_bus.c
@@ -72,7 +72,6 @@ DEFINE_CLASS_1(mv_cp110_icu_bus, mv_cp110_icu_bus_driver,
     mv_cp110_icu_bus_methods, sizeof(struct simple_mfd_softc),
     simple_mfd_driver);
 
-static devclass_t mv_cp110_icu_bus_devclass;
-EARLY_DRIVER_MODULE(mv_cp110_icu_bus, simplebus, mv_cp110_icu_bus_driver,
-    mv_cp110_icu_bus_devclass, 0, 0, BUS_PASS_INTERRUPT);
+EARLY_DRIVER_MODULE(mv_cp110_icu_bus, simplebus, mv_cp110_icu_bus_driver, 0, 0,
+    BUS_PASS_INTERRUPT);
 MODULE_VERSION(mv_cp110_icu_bus, 1);
diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index 7b7dc9111c2b..5d2dc66ca4c5 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -407,10 +407,8 @@ static driver_t mv_pcib_driver = {
 	sizeof(struct mv_pcib_softc),
 };
 
-devclass_t pcib_devclass;
-
-DRIVER_MODULE(mv_pcib, ofwbus, mv_pcib_driver, pcib_devclass, 0, 0);
-DRIVER_MODULE(mv_pcib, pcib_ctrl, mv_pcib_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(mv_pcib, ofwbus, mv_pcib_driver, 0, 0);
+DRIVER_MODULE(mv_pcib, pcib_ctrl, mv_pcib_driver, 0, 0);
 
 static struct mtx pcicfg_mtx;
 
diff --git a/sys/arm/mv/mv_pci_ctrl.c b/sys/arm/mv/mv_pci_ctrl.c
index 0b51a5289c9e..4b7b1721a1fa 100644
--- a/sys/arm/mv/mv_pci_ctrl.c
+++ b/sys/arm/mv/mv_pci_ctrl.c
@@ -124,9 +124,7 @@ static driver_t mv_pcib_ctrl_driver = {
 	sizeof(struct mv_pcib_ctrl_softc),
 };
 
-devclass_t pcib_ctrl_devclass;
-
-DRIVER_MODULE(pcib_ctrl, simplebus, mv_pcib_ctrl_driver, pcib_ctrl_devclass, 0, 0);
+DRIVER_MODULE(pcib_ctrl, simplebus, mv_pcib_ctrl_driver, 0, 0);
 
 MALLOC_DEFINE(M_PCIB_CTRL, "PCIe Bus Controller",
     "Marvell Integrated PCIe Bus Controller");
diff --git a/sys/arm/mv/mv_spi.c b/sys/arm/mv/mv_spi.c
index 256c8ff9161c..13e7cf9a5529 100644
--- a/sys/arm/mv/mv_spi.c
+++ b/sys/arm/mv/mv_spi.c
@@ -397,12 +397,10 @@ static device_method_t mv_spi_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_spi_devclass;
-
 static driver_t mv_spi_driver = {
 	"spi",
 	mv_spi_methods,
 	sizeof(struct mv_spi_softc),
 };
 
-DRIVER_MODULE(mv_spi, simplebus, mv_spi_driver, mv_spi_devclass, 0, 0);
+DRIVER_MODULE(mv_spi, simplebus, mv_spi_driver, 0, 0);
diff --git a/sys/arm/mv/mv_thermal.c b/sys/arm/mv/mv_thermal.c
index 05000b9e06db..7b4c15d465ef 100644
--- a/sys/arm/mv/mv_thermal.c
+++ b/sys/arm/mv/mv_thermal.c
@@ -363,13 +363,10 @@ static device_method_t mv_thermal_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_thermal_devclass;
-
 static driver_t mv_thermal_driver = {
 	"mv_thermal",
 	mv_thermal_methods,
 	sizeof(struct mv_thermal_softc),
 };
 
-DRIVER_MODULE(mv_thermal, simplebus, mv_thermal_driver,
-    mv_thermal_devclass, 0, 0);
+DRIVER_MODULE(mv_thermal, simplebus, mv_thermal_driver, 0, 0);
diff --git a/sys/arm/mv/mvebu_gpio.c b/sys/arm/mv/mvebu_gpio.c
index 21766f57c9b6..860768bab8ee 100644
--- a/sys/arm/mv/mvebu_gpio.c
+++ b/sys/arm/mv/mvebu_gpio.c
@@ -868,9 +868,7 @@ static device_method_t mvebu_gpio_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mvebu_gpio_devclass;
 static DEFINE_CLASS_0(gpio, mvebu_gpio_driver, mvebu_gpio_methods,
     sizeof(struct mvebu_gpio_softc));
-EARLY_DRIVER_MODULE(mvebu_gpio, simplebus, mvebu_gpio_driver,
-     mvebu_gpio_devclass, NULL, NULL,
+EARLY_DRIVER_MODULE(mvebu_gpio, simplebus, mvebu_gpio_driver, NULL, NULL,
      BUS_PASS_TIMER + BUS_PASS_ORDER_LAST);
diff --git a/sys/arm/mv/mvebu_pinctrl.c b/sys/arm/mv/mvebu_pinctrl.c
index e43c5a41d3a0..2a8a657a8108 100644
--- a/sys/arm/mv/mvebu_pinctrl.c
+++ b/sys/arm/mv/mvebu_pinctrl.c
@@ -224,13 +224,11 @@ static device_method_t mv_pinctrl_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t mv_pinctrl_devclass;
-
 static driver_t mv_pinctrl_driver = {
 	"mv_pinctrl",
 	mv_pinctrl_methods,
 	sizeof(struct mv_pinctrl_softc),
 };
 
-EARLY_DRIVER_MODULE(mv_pinctrl, simplebus, mv_pinctrl_driver,
-    mv_pinctrl_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(mv_pinctrl, simplebus, mv_pinctrl_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/mv/rtc.c b/sys/arm/mv/rtc.c
index 61c879d525e3..9be16c905a19 100644
--- a/sys/arm/mv/rtc.c
+++ b/sys/arm/mv/rtc.c
@@ -91,9 +91,8 @@ static driver_t mv_rtc_driver = {
 	mv_rtc_methods,
 	sizeof(struct mv_rtc_softc),
 };
-static devclass_t mv_rtc_devclass;
 
-DRIVER_MODULE(mv_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0);
+DRIVER_MODULE(mv_rtc, simplebus, mv_rtc_driver, 0, 0);
 
 static int
 mv_rtc_probe(device_t dev)
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c
index 14052ac2ca25..4dff80a0662c 100644
--- a/sys/arm/mv/timer.c
+++ b/sys/arm/mv/timer.c
@@ -296,9 +296,7 @@ static driver_t mv_timer_driver = {
 	sizeof(struct mv_timer_softc),
 };
 
-static devclass_t mv_timer_devclass;
-
-DRIVER_MODULE(timer_mv, simplebus, mv_timer_driver, mv_timer_devclass, 0, 0);
+DRIVER_MODULE(timer_mv, simplebus, mv_timer_driver, 0, 0);
 
 static unsigned
 mv_timer_get_timecount(struct timecounter *tc)