git: 82d4dc0621c9 - main - arm/arm64 broadcom: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 09 May 2022 21:47:47 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=82d4dc0621c92e3c05a86013eec35afbdec057a5
commit 82d4dc0621c92e3c05a86013eec35afbdec057a5
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-09 21:26:44 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-09 21:26:44 +0000
arm/arm64 broadcom: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/arm/broadcom/bcm2835/bcm2835_bsc.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_clkman.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_dma.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_fb.c | 6 ++----
sys/arm/broadcom/bcm2835/bcm2835_fbd.c | 6 ++----
sys/arm/broadcom/bcm2835/bcm2835_firmware.c | 5 ++---
sys/arm/broadcom/bcm2835/bcm2835_ft5406.c | 3 +--
sys/arm/broadcom/bcm2835/bcm2835_gpio.c | 5 ++---
sys/arm/broadcom/bcm2835/bcm2835_intr.c | 6 ++----
sys/arm/broadcom/bcm2835/bcm2835_mbox.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_pwm.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_rng.c | 7 ++-----
sys/arm/broadcom/bcm2835/bcm2835_sdhci.c | 5 +----
sys/arm/broadcom/bcm2835/bcm2835_sdhost.c | 5 +----
sys/arm/broadcom/bcm2835/bcm2835_spi.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_systimer.c | 4 +---
sys/arm/broadcom/bcm2835/bcm2835_wdog.c | 3 +--
sys/arm/broadcom/bcm2835/bcm2836.c | 6 ++----
sys/arm/broadcom/bcm2835/bcm2838_pci.c | 3 +--
sys/arm/broadcom/bcm2835/bcm2838_xhci.c | 4 ++--
sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c | 5 +----
sys/arm/broadcom/bcm2835/raspberrypi_gpio.c | 6 ++----
sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c | 10 ++++------
sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c | 5 ++---
sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c | 5 ++---
sys/arm64/broadcom/genet/if_genet.c | 4 +---
27 files changed, 41 insertions(+), 90 deletions(-)
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
index 652c25957983..da5f54a9eea0 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
@@ -715,8 +715,6 @@ static device_method_t bcm_bsc_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm_bsc_devclass;
-
static driver_t bcm_bsc_driver = {
"iichb",
bcm_bsc_methods,
@@ -724,4 +722,4 @@ static driver_t bcm_bsc_driver = {
};
DRIVER_MODULE(iicbus, bcm2835_bsc, iicbus_driver, 0, 0);
-DRIVER_MODULE(bcm2835_bsc, simplebus, bcm_bsc_driver, bcm_bsc_devclass, 0, 0);
+DRIVER_MODULE(bcm2835_bsc, simplebus, bcm_bsc_driver, 0, 0);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_clkman.c b/sys/arm/broadcom/bcm2835/bcm2835_clkman.c
index d33ff1ff73f0..40fb75a3b050 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_clkman.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_clkman.c
@@ -201,13 +201,11 @@ static device_method_t bcm2835_clkman_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm2835_clkman_devclass;
static driver_t bcm2835_clkman_driver = {
"bcm2835_clkman",
bcm2835_clkman_methods,
sizeof(struct bcm2835_clkman_softc),
};
-DRIVER_MODULE(bcm2835_clkman, simplebus, bcm2835_clkman_driver,
- bcm2835_clkman_devclass, 0, 0);
+DRIVER_MODULE(bcm2835_clkman, simplebus, bcm2835_clkman_driver, 0, 0);
MODULE_VERSION(bcm2835_clkman, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
index 1c767ad629d6..49a7dcff9b59 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
@@ -1594,13 +1594,11 @@ static device_method_t bcm2835_cpufreq_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm2835_cpufreq_devclass;
static driver_t bcm2835_cpufreq_driver = {
"bcm2835_cpufreq",
bcm2835_cpufreq_methods,
sizeof(struct bcm2835_cpufreq_softc),
};
-DRIVER_MODULE(bcm2835_cpufreq, cpu, bcm2835_cpufreq_driver,
- bcm2835_cpufreq_devclass, 0, 0);
+DRIVER_MODULE(bcm2835_cpufreq, cpu, bcm2835_cpufreq_driver, 0, 0);
MODULE_DEPEND(bcm2835_cpufreq, bcm2835_firmware, 1, 1, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
index cab8639bb607..5f9ecb0b7981 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
@@ -764,7 +764,5 @@ static driver_t bcm_dma_driver = {
sizeof(struct bcm_dma_softc),
};
-static devclass_t bcm_dma_devclass;
-
-DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, bcm_dma_devclass, 0, 0);
+DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, 0, 0);
MODULE_VERSION(bcm_dma, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
index 40c4a29c3e95..7f70cd280efa 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -194,16 +194,14 @@ static device_method_t bcm_fb_methods[] = {
{ 0, 0 }
};
-static devclass_t bcm_fb_devclass;
-
static driver_t bcm_fb_driver = {
"fb",
bcm_fb_methods,
sizeof(struct bcmsc_softc),
};
-DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
-DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
+DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, 0, 0);
+DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, 0, 0);
/*
* Video driver routines and glue.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
index c148235e5c33..2b0b89d36342 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
@@ -275,13 +275,11 @@ static device_method_t bcm_fb_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm_fb_devclass;
-
static driver_t bcm_fb_driver = {
"fb",
bcm_fb_methods,
sizeof(struct bcmsc_softc),
};
-DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
-DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
+DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, 0, 0);
+DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, 0, 0);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_firmware.c b/sys/arm/broadcom/bcm2835/bcm2835_firmware.c
index 03eb4878d23a..5137511619fc 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_firmware.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_firmware.c
@@ -174,11 +174,10 @@ static device_method_t bcm2835_firmware_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm2835_firmware_devclass;
DEFINE_CLASS_1(bcm2835_firmware, bcm2835_firmware_driver,
bcm2835_firmware_methods, sizeof(struct bcm2835_firmware_softc),
simplebus_driver);
-EARLY_DRIVER_MODULE(bcm2835_firmware, simplebus, bcm2835_firmware_driver,
- bcm2835_firmware_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(bcm2835_firmware, simplebus, bcm2835_firmware_driver, 0, 0,
+ BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
MODULE_DEPEND(bcm2835_firmware, mbox, 1, 1, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c b/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
index 24396b1bd90b..d3a75b765561 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
@@ -325,12 +325,11 @@ static device_method_t ft5406ts_methods[] = {
DEVMETHOD_END
};
-static devclass_t ft5406ts_devclass;
static driver_t ft5406ts_driver = {
"ft5406ts",
ft5406ts_methods,
sizeof(struct ft5406ts_softc),
};
-DRIVER_MODULE(ft5406ts, simplebus, ft5406ts_driver, ft5406ts_devclass, 0, 0);
+DRIVER_MODULE(ft5406ts, simplebus, ft5406ts_driver, 0, 0);
MODULE_DEPEND(ft5406ts, evdev, 1, 1, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
index b07e5cc6c361..56605ca08c62 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -1311,12 +1311,11 @@ static device_method_t bcm_gpio_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm_gpio_devclass;
-
static driver_t bcm_gpio_driver = {
"gpio",
bcm_gpio_methods,
sizeof(struct bcm_gpio_softc),
};
-EARLY_DRIVER_MODULE(bcm_gpio, simplebus, bcm_gpio_driver, bcm_gpio_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(bcm_gpio, simplebus, bcm_gpio_driver, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
index 93c044fe6419..af662ae3ba51 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -447,7 +447,5 @@ static driver_t bcm_intc_driver = {
sizeof(struct bcm_intc_softc),
};
-static devclass_t bcm_intc_devclass;
-
-EARLY_DRIVER_MODULE(intc, simplebus, bcm_intc_driver, bcm_intc_devclass,
- 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(intc, simplebus, bcm_intc_driver, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
index d31989b7ddeb..cd1420e8d344 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
@@ -292,9 +292,7 @@ static driver_t bcm_mbox_driver = {
sizeof(struct bcm_mbox_softc),
};
-static devclass_t bcm_mbox_devclass;
-
-EARLY_DRIVER_MODULE(mbox, simplebus, bcm_mbox_driver, bcm_mbox_devclass, 0, 0,
+EARLY_DRIVER_MODULE(mbox, simplebus, bcm_mbox_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
static void
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_pwm.c b/sys/arm/broadcom/bcm2835/bcm2835_pwm.c
index 348c1435f85d..ca472d1e3f3a 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_pwm.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_pwm.c
@@ -500,13 +500,11 @@ static device_method_t bcm_pwm_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm_pwm_devclass;
-
static driver_t bcm_pwm_driver = {
"pwm",
bcm_pwm_methods,
sizeof(struct bcm_pwm_softc),
};
-DRIVER_MODULE(bcm2835_pwm, simplebus, bcm_pwm_driver, bcm_pwm_devclass, 0, 0);
+DRIVER_MODULE(bcm2835_pwm, simplebus, bcm_pwm_driver, 0, 0);
MODULE_DEPEND(bcm2835_pwm, bcm2835_clkman, 1, 1, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_rng.c b/sys/arm/broadcom/bcm2835/bcm2835_rng.c
index c403bc3542e0..5067120c80fa 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_rng.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_rng.c
@@ -549,11 +549,8 @@ static driver_t bcm2835_rng_driver = {
bcm2835_rng_methods,
sizeof(struct bcm2835_rng_softc)
};
-static devclass_t bcm2835_rng_devclass;
-DRIVER_MODULE(bcm2835_rng, simplebus, bcm2835_rng_driver,
- bcm2835_rng_devclass, 0, 0);
-DRIVER_MODULE(bcm2835_rng, ofwbus, bcm2835_rng_driver, bcm2835_rng_devclass, 0,
- 0);
+DRIVER_MODULE(bcm2835_rng, simplebus, bcm2835_rng_driver, 0, 0);
+DRIVER_MODULE(bcm2835_rng, ofwbus, bcm2835_rng_driver, 0, 0);
MODULE_VERSION(bcm2835_rng, 1);
MODULE_DEPEND(bcm2835_rng, randomdev, 1, 1, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
index 1ff7a2d189ba..0e9be2205000 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
@@ -852,16 +852,13 @@ static device_method_t bcm_sdhci_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm_sdhci_devclass;
-
static driver_t bcm_sdhci_driver = {
"sdhci_bcm",
bcm_sdhci_methods,
sizeof(struct bcm_sdhci_softc),
};
-DRIVER_MODULE(sdhci_bcm, simplebus, bcm_sdhci_driver, bcm_sdhci_devclass,
- NULL, NULL);
+DRIVER_MODULE(sdhci_bcm, simplebus, bcm_sdhci_driver, NULL, NULL);
#ifdef NOTYET
MODULE_DEPEND(sdhci_bcm, bcm2835_clkman, 1, 1, 1);
#endif
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
index 5eb94c6f360f..a3bfc206c0d2 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
@@ -1274,16 +1274,13 @@ static device_method_t bcm_sdhost_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm_sdhost_devclass;
-
static driver_t bcm_sdhost_driver = {
"sdhost_bcm",
bcm_sdhost_methods,
sizeof(struct bcm_sdhost_softc),
};
-DRIVER_MODULE(sdhost_bcm, simplebus, bcm_sdhost_driver, bcm_sdhost_devclass,
- NULL, NULL);
+DRIVER_MODULE(sdhost_bcm, simplebus, bcm_sdhost_driver, NULL, NULL);
SDHCI_DEPEND(sdhost_bcm);
#ifndef MMCCAM
MMC_DECLARE_BRIDGE(sdhost_bcm);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spi.c b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
index f659bcc5023e..b9d25d6c1b48 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spi.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
@@ -561,12 +561,10 @@ static device_method_t bcm_spi_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm_spi_devclass;
-
static driver_t bcm_spi_driver = {
"spi",
bcm_spi_methods,
sizeof(struct bcm_spi_softc),
};
-DRIVER_MODULE(bcm2835_spi, simplebus, bcm_spi_driver, bcm_spi_devclass, 0, 0);
+DRIVER_MODULE(bcm2835_spi, simplebus, bcm_spi_driver, 0, 0);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
index 7c8c1d996607..64b450eda221 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
@@ -285,9 +285,7 @@ static driver_t bcm_systimer_driver = {
sizeof(struct bcm_systimer_softc),
};
-static devclass_t bcm_systimer_devclass;
-
-DRIVER_MODULE(bcm_systimer, simplebus, bcm_systimer_driver, bcm_systimer_devclass, 0, 0);
+DRIVER_MODULE(bcm_systimer, simplebus, bcm_systimer_driver, 0, 0);
static void
bcm_systimer_delay(int usec, void *arg)
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
index 816123943a2a..bfc934ccd5ec 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
@@ -256,6 +256,5 @@ static driver_t bcmwd_driver = {
bcmwd_methods,
sizeof(struct bcmwd_softc),
};
-static devclass_t bcmwd_devclass;
-DRIVER_MODULE(bcmwd, simplebus, bcmwd_driver, bcmwd_devclass, 0, 0);
+DRIVER_MODULE(bcmwd, simplebus, bcmwd_driver, 0, 0);
diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c
index 33f872bec89e..50759cd45b6f 100644
--- a/sys/arm/broadcom/bcm2835/bcm2836.c
+++ b/sys/arm/broadcom/bcm2835/bcm2836.c
@@ -739,7 +739,5 @@ static driver_t bcm_lintc_driver = {
sizeof(struct bcm_lintc_softc),
};
-static devclass_t bcm_lintc_devclass;
-
-EARLY_DRIVER_MODULE(lintc, simplebus, bcm_lintc_driver, bcm_lintc_devclass,
- 0, 0, BUS_PASS_INTERRUPT);
+EARLY_DRIVER_MODULE(lintc, simplebus, bcm_lintc_driver, 0, 0,
+ BUS_PASS_INTERRUPT);
diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c
index 15111f73ca5e..8511b2ea5fe2 100644
--- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c
@@ -777,6 +777,5 @@ static device_method_t bcm_pcib_methods[] = {
DEFINE_CLASS_1(pcib, bcm_pcib_driver, bcm_pcib_methods,
sizeof(struct bcm_pcib_softc), generic_pcie_fdt_driver);
-static devclass_t bcm_pcib_devclass;
-DRIVER_MODULE(bcm_pcib, simplebus, bcm_pcib_driver, bcm_pcib_devclass, 0, 0);
+DRIVER_MODULE(bcm_pcib, simplebus, bcm_pcib_driver, 0, 0);
diff --git a/sys/arm/broadcom/bcm2835/bcm2838_xhci.c b/sys/arm/broadcom/bcm2835/bcm2838_xhci.c
index 4eb9ce748376..7c389771853d 100644
--- a/sys/arm/broadcom/bcm2835/bcm2838_xhci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2838_xhci.c
@@ -214,5 +214,5 @@ static device_method_t bcm_xhci_methods[] = {
DEFINE_CLASS_1(bcm_xhci, bcm_xhci_driver, bcm_xhci_methods,
sizeof(struct xhci_softc), xhci_pci_driver);
-static devclass_t xhci_devclass;
-DRIVER_MODULE(bcm_xhci, pci, bcm_xhci_driver, xhci_devclass, 0, 0); MODULE_DEPEND(bcm_xhci, usb, 1, 1, 1);
+DRIVER_MODULE(bcm_xhci, pci, bcm_xhci_driver, 0, 0);
+MODULE_DEPEND(bcm_xhci, usb, 1, 1, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c b/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c
index 2429d09aa164..1d995c38730c 100644
--- a/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c
+++ b/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c
@@ -96,10 +96,7 @@ static device_method_t bcm283x_dwc_otg_methods[] = {
DEVMETHOD_END
};
-static devclass_t bcm283x_dwc_otg_devclass;
-
DEFINE_CLASS_1(bcm283x_dwcotg, bcm283x_dwc_otg_driver, bcm283x_dwc_otg_methods,
sizeof(struct dwc_otg_fdt_softc), dwc_otg_driver);
-DRIVER_MODULE(bcm283x_dwcotg, simplebus, bcm283x_dwc_otg_driver,
- bcm283x_dwc_otg_devclass, 0, 0);
+DRIVER_MODULE(bcm283x_dwcotg, simplebus, bcm283x_dwc_otg_driver, 0, 0);
MODULE_DEPEND(bcm283x_dwcotg, usb, 1, 1, 1);
diff --git a/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c b/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
index d79d39ff1497..d2d1fec770c3 100644
--- a/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
+++ b/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
@@ -445,13 +445,11 @@ static device_method_t rpi_fw_gpio_methods[] = {
DEVMETHOD_END
};
-static devclass_t rpi_fw_gpio_devclass;
-
static driver_t rpi_fw_gpio_driver = {
"gpio",
rpi_fw_gpio_methods,
sizeof(struct rpi_fw_gpio_softc),
};
-EARLY_DRIVER_MODULE(rpi_fw_gpio, bcm2835_firmware, rpi_fw_gpio_driver,
- rpi_fw_gpio_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(rpi_fw_gpio, bcm2835_firmware, rpi_fw_gpio_driver, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c b/sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c
index 51930d88e43f..5eb8f0ad47f7 100644
--- a/sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c
+++ b/sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c
@@ -138,12 +138,10 @@ static device_method_t brcm_iproc_mdio_fdt_methods[] = {
DEFINE_CLASS_0(brcm_iproc_mdio, brcm_iproc_mdio_driver,
brcm_iproc_mdio_fdt_methods, sizeof(struct brcm_iproc_mdio_softc));
-static devclass_t brcm_iproc_mdio_fdt_devclass;
-
-EARLY_DRIVER_MODULE(brcm_iproc_mdio, ofwbus, brcm_iproc_mdio_driver,
- brcm_iproc_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
-EARLY_DRIVER_MODULE(brcm_iproc_mdio, simplebus, brcm_iproc_mdio_driver,
- brcm_iproc_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(brcm_iproc_mdio, ofwbus, brcm_iproc_mdio_driver, 0, 0,
+ BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(brcm_iproc_mdio, simplebus, brcm_iproc_mdio_driver, 0, 0,
+ BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
static struct ofw_compat_data mdio_compat_data[] = {
{"brcm,mdio-mux-iproc", true},
diff --git a/sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c b/sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c
index 7385f6896db4..ab993327c7be 100644
--- a/sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c
+++ b/sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c
@@ -95,15 +95,14 @@ static device_method_t brcm_mdionexus_fdt_methods[] = {
DEFINE_CLASS_0(brcm_mdionexus, brcm_mdionexus_fdt_driver, brcm_mdionexus_fdt_methods,
sizeof(struct brcm_mdionexus_softc));
-static devclass_t brcm_mdionexus_fdt_devclass;
-
static driver_t brcm_mdionexus_driver = {
"brcm_mdionexus",
brcm_mdionexus_fdt_methods,
sizeof(struct brcm_mdionexus_softc)
};
+
EARLY_DRIVER_MODULE(brcm_mdionexus, brcm_iproc_mdio, brcm_mdionexus_driver,
- brcm_mdionexus_fdt_devclass, NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+ NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
static int brcm_mdionexus_ofw_bus_attach(device_t);
diff --git a/sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c b/sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c
index e2e29ad17815..be28697be55c 100644
--- a/sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c
+++ b/sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c
@@ -69,15 +69,14 @@ static device_method_t ns2_pcie_phy_fdt_methods[] = {
DEFINE_CLASS_0(ns2_pcie_phy, ns2_pcie_phy_fdt_driver, ns2_pcie_phy_fdt_methods,
sizeof(struct ns2_pcie_phy_softc));
-static devclass_t ns2_pcie_phy_fdt_devclass;
-
static driver_t ns2_pcie_phy_driver = {
"ns2_pcie_phy",
ns2_pcie_phy_fdt_methods,
sizeof(struct ns2_pcie_phy_softc)
};
+
EARLY_DRIVER_MODULE(ns2_pcie_phy, brcm_mdionexus, ns2_pcie_phy_driver,
- ns2_pcie_phy_fdt_devclass, NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+ NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
static int
ns2_pci_phy_init(device_t dev)
diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c
index 3e22f387bf61..327af8acbcdd 100644
--- a/sys/arm64/broadcom/genet/if_genet.c
+++ b/sys/arm64/broadcom/genet/if_genet.c
@@ -1821,9 +1821,7 @@ static driver_t gen_driver = {
sizeof(struct gen_softc),
};
-static devclass_t gen_devclass;
-
-DRIVER_MODULE(genet, simplebus, gen_driver, gen_devclass, 0, 0);
+DRIVER_MODULE(genet, simplebus, gen_driver, 0, 0);
DRIVER_MODULE(miibus, genet, miibus_driver, 0, 0);
MODULE_DEPEND(genet, ether, 1, 1, 1);
MODULE_DEPEND(genet, miibus, 1, 1, 1);