git: 7e1e2ba1704d - main - arm allwinner: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 09 May 2022 21:47:44 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=7e1e2ba1704db2d78391cdd49df1485bafbefaed
commit 7e1e2ba1704db2d78391cdd49df1485bafbefaed
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 allwinner: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/arm/allwinner/a10/a10_intc.c | 4 +---
sys/arm/allwinner/a10_dmac.c | 4 +---
sys/arm/allwinner/a10_fb.c | 4 +---
sys/arm/allwinner/a10_hdmi.c | 4 +---
sys/arm/allwinner/a10_sramc.c | 6 ++----
sys/arm/allwinner/a10_timer.c | 4 +---
sys/arm/allwinner/a20/a20_cpu_cfg.c | 4 +---
sys/arm/allwinner/a31_dmac.c | 4 +---
sys/arm/allwinner/a33_codec.c | 4 +---
sys/arm/allwinner/a64/sun50i_a64_acodec.c | 4 +---
sys/arm/allwinner/aw_ccu.c | 6 ++----
sys/arm/allwinner/aw_cir.c | 3 +--
sys/arm/allwinner/aw_dwc3.c | 4 +---
sys/arm/allwinner/aw_gmacclk.c | 6 ++----
sys/arm/allwinner/aw_gpio.c | 4 +---
sys/arm/allwinner/aw_i2s.c | 4 +---
sys/arm/allwinner/aw_if_dwc.c | 4 +---
sys/arm/allwinner/aw_mmc.c | 5 +----
sys/arm/allwinner/aw_nmi.c | 6 ++----
sys/arm/allwinner/aw_pwm.c | 4 +---
sys/arm/allwinner/aw_r_intc.c | 6 ++----
sys/arm/allwinner/aw_reset.c | 6 ++----
sys/arm/allwinner/aw_rsb.c | 4 +---
sys/arm/allwinner/aw_rtc.c | 4 +---
sys/arm/allwinner/aw_sid.c | 4 +---
sys/arm/allwinner/aw_spi.c | 4 +---
sys/arm/allwinner/aw_syscon.c | 5 ++---
sys/arm/allwinner/aw_thermal.c | 5 +----
sys/arm/allwinner/aw_ts.c | 3 +--
sys/arm/allwinner/aw_usb3phy.c | 5 ++---
sys/arm/allwinner/aw_usbphy.c | 5 ++---
sys/arm/allwinner/aw_wdog.c | 3 +--
sys/arm/allwinner/axp209.c | 5 ++---
sys/arm/allwinner/axp81x.c | 3 +--
sys/arm/allwinner/clkng/ccu_a10.c | 6 ++----
sys/arm/allwinner/clkng/ccu_a13.c | 6 ++----
sys/arm/allwinner/clkng/ccu_a31.c | 6 ++----
sys/arm/allwinner/clkng/ccu_a64.c | 6 ++----
sys/arm/allwinner/clkng/ccu_a83t.c | 6 ++----
sys/arm/allwinner/clkng/ccu_de2.c | 6 ++----
sys/arm/allwinner/clkng/ccu_h3.c | 6 ++----
sys/arm/allwinner/clkng/ccu_h6.c | 6 ++----
sys/arm/allwinner/clkng/ccu_h6_r.c | 6 ++----
sys/arm/allwinner/clkng/ccu_sun8i_r.c | 12 ++++--------
sys/arm/allwinner/if_awg.c | 4 +---
sys/arm/allwinner/if_emac.c | 4 +---
46 files changed, 68 insertions(+), 156 deletions(-)
diff --git a/sys/arm/allwinner/a10/a10_intc.c b/sys/arm/allwinner/a10/a10_intc.c
index 28cc245c7254..5a36377b8089 100644
--- a/sys/arm/allwinner/a10/a10_intc.c
+++ b/sys/arm/allwinner/a10/a10_intc.c
@@ -384,7 +384,5 @@ static driver_t a10_aintc_driver = {
sizeof(struct a10_aintc_softc),
};
-static devclass_t a10_aintc_devclass;
-
-EARLY_DRIVER_MODULE(aintc, simplebus, a10_aintc_driver, a10_aintc_devclass, 0, 0,
+EARLY_DRIVER_MODULE(aintc, simplebus, a10_aintc_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_FIRST);
diff --git a/sys/arm/allwinner/a10_dmac.c b/sys/arm/allwinner/a10_dmac.c
index 28292ba7e5a4..0ecd68917d8a 100644
--- a/sys/arm/allwinner/a10_dmac.c
+++ b/sys/arm/allwinner/a10_dmac.c
@@ -468,6 +468,4 @@ static driver_t a10dmac_driver = {
sizeof(struct a10dmac_softc)
};
-static devclass_t a10dmac_devclass;
-
-DRIVER_MODULE(a10dmac, simplebus, a10dmac_driver, a10dmac_devclass, 0, 0);
+DRIVER_MODULE(a10dmac, simplebus, a10dmac_driver, 0, 0);
diff --git a/sys/arm/allwinner/a10_fb.c b/sys/arm/allwinner/a10_fb.c
index d7d37e601b7d..387d5daa10c1 100644
--- a/sys/arm/allwinner/a10_fb.c
+++ b/sys/arm/allwinner/a10_fb.c
@@ -657,6 +657,4 @@ static driver_t a10fb_driver = {
sizeof(struct a10fb_softc),
};
-static devclass_t a10fb_devclass;
-
-DRIVER_MODULE(fb, simplebus, a10fb_driver, a10fb_devclass, 0, 0);
+DRIVER_MODULE(fb, simplebus, a10fb_driver, 0, 0);
diff --git a/sys/arm/allwinner/a10_hdmi.c b/sys/arm/allwinner/a10_hdmi.c
index bc2788498004..ee57c07737de 100644
--- a/sys/arm/allwinner/a10_hdmi.c
+++ b/sys/arm/allwinner/a10_hdmi.c
@@ -719,7 +719,5 @@ static driver_t a10hdmi_driver = {
sizeof(struct a10hdmi_softc),
};
-static devclass_t a10hdmi_devclass;
-
-DRIVER_MODULE(a10hdmi, simplebus, a10hdmi_driver, a10hdmi_devclass, 0, 0);
+DRIVER_MODULE(a10hdmi, simplebus, a10hdmi_driver, 0, 0);
MODULE_VERSION(a10hdmi, 1);
diff --git a/sys/arm/allwinner/a10_sramc.c b/sys/arm/allwinner/a10_sramc.c
index 2227b12c3674..776137d32894 100644
--- a/sys/arm/allwinner/a10_sramc.c
+++ b/sys/arm/allwinner/a10_sramc.c
@@ -112,10 +112,8 @@ static driver_t a10_sramc_driver = {
sizeof(struct a10_sramc_softc),
};
-static devclass_t a10_sramc_devclass;
-
-EARLY_DRIVER_MODULE(a10_sramc, simplebus, a10_sramc_driver, a10_sramc_devclass,
- 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_FIRST);
+EARLY_DRIVER_MODULE(a10_sramc, simplebus, a10_sramc_driver, 0, 0,
+ BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_FIRST);
int
a10_map_to_emac(void)
diff --git a/sys/arm/allwinner/a10_timer.c b/sys/arm/allwinner/a10_timer.c
index 239ae10e0c95..b13223f5efba 100644
--- a/sys/arm/allwinner/a10_timer.c
+++ b/sys/arm/allwinner/a10_timer.c
@@ -479,7 +479,5 @@ static driver_t a10_timer_driver = {
sizeof(struct a10_timer_softc),
};
-static devclass_t a10_timer_devclass;
-
-EARLY_DRIVER_MODULE(a10_timer, simplebus, a10_timer_driver, a10_timer_devclass, 0, 0,
+EARLY_DRIVER_MODULE(a10_timer, simplebus, a10_timer_driver, 0, 0,
BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.c b/sys/arm/allwinner/a20/a20_cpu_cfg.c
index d26b30cd9449..f323f3483fe0 100644
--- a/sys/arm/allwinner/a20/a20_cpu_cfg.c
+++ b/sys/arm/allwinner/a20/a20_cpu_cfg.c
@@ -116,9 +116,7 @@ static driver_t a20_cpu_cfg_driver = {
sizeof(struct a20_cpu_cfg_softc),
};
-static devclass_t a20_cpu_cfg_devclass;
-
-EARLY_DRIVER_MODULE(a20_cpu_cfg, simplebus, a20_cpu_cfg_driver, a20_cpu_cfg_devclass, 0, 0,
+EARLY_DRIVER_MODULE(a20_cpu_cfg, simplebus, a20_cpu_cfg_driver, 0, 0,
BUS_PASS_CPU + BUS_PASS_ORDER_FIRST);
uint64_t
diff --git a/sys/arm/allwinner/a31_dmac.c b/sys/arm/allwinner/a31_dmac.c
index 8af9bca73f98..26e4b45d677d 100644
--- a/sys/arm/allwinner/a31_dmac.c
+++ b/sys/arm/allwinner/a31_dmac.c
@@ -554,6 +554,4 @@ static driver_t a31dmac_driver = {
sizeof(struct a31dmac_softc)
};
-static devclass_t a31dmac_devclass;
-
-DRIVER_MODULE(a31dmac, simplebus, a31dmac_driver, a31dmac_devclass, 0, 0);
+DRIVER_MODULE(a31dmac, simplebus, a31dmac_driver, 0, 0);
diff --git a/sys/arm/allwinner/a33_codec.c b/sys/arm/allwinner/a33_codec.c
index 25209d0b47d8..79866587ed3d 100644
--- a/sys/arm/allwinner/a33_codec.c
+++ b/sys/arm/allwinner/a33_codec.c
@@ -408,7 +408,5 @@ static driver_t sun8i_codec_driver = {
sizeof(struct sun8i_codec_softc),
};
-static devclass_t sun8i_codec_devclass;
-
-DRIVER_MODULE(sun8i_codec, simplebus, sun8i_codec_driver, sun8i_codec_devclass, 0, 0);
+DRIVER_MODULE(sun8i_codec, simplebus, sun8i_codec_driver, 0, 0);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/a64/sun50i_a64_acodec.c b/sys/arm/allwinner/a64/sun50i_a64_acodec.c
index 10febf98abd8..0b63ca4a1d35 100644
--- a/sys/arm/allwinner/a64/sun50i_a64_acodec.c
+++ b/sys/arm/allwinner/a64/sun50i_a64_acodec.c
@@ -482,7 +482,5 @@ static driver_t a64codec_driver = {
sizeof(struct a64codec_softc),
};
-static devclass_t a64codec_devclass;
-
-DRIVER_MODULE(a64codec, simplebus, a64codec_driver, a64codec_devclass, 0, 0);
+DRIVER_MODULE(a64codec, simplebus, a64codec_driver, 0, 0);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/aw_ccu.c b/sys/arm/allwinner/aw_ccu.c
index 6cdf75ffecf9..ce31ad4f4c46 100644
--- a/sys/arm/allwinner/aw_ccu.c
+++ b/sys/arm/allwinner/aw_ccu.c
@@ -246,9 +246,7 @@ static device_method_t aw_ccu_methods[] = {
DEFINE_CLASS_1(aw_ccu, aw_ccu_driver, aw_ccu_methods,
sizeof(struct aw_ccu_softc), simplebus_driver);
-static devclass_t aw_ccu_devclass;
-
-EARLY_DRIVER_MODULE(aw_ccu, simplebus, aw_ccu_driver, aw_ccu_devclass,
- 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(aw_ccu, simplebus, aw_ccu_driver, 0, 0,
+ BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
MODULE_VERSION(aw_ccu, 1);
diff --git a/sys/arm/allwinner/aw_cir.c b/sys/arm/allwinner/aw_cir.c
index 855769a7456e..30a00b99a467 100644
--- a/sys/arm/allwinner/aw_cir.c
+++ b/sys/arm/allwinner/aw_cir.c
@@ -556,7 +556,6 @@ static driver_t aw_ir_driver = {
aw_ir_methods,
sizeof(struct aw_ir_softc),
};
-static devclass_t aw_ir_devclass;
-DRIVER_MODULE(aw_ir, simplebus, aw_ir_driver, aw_ir_devclass, 0, 0);
+DRIVER_MODULE(aw_ir, simplebus, aw_ir_driver, 0, 0);
MODULE_DEPEND(aw_ir, evdev, 1, 1, 1);
diff --git a/sys/arm/allwinner/aw_dwc3.c b/sys/arm/allwinner/aw_dwc3.c
index 6f15fe18d10e..d99ea66ce1a3 100644
--- a/sys/arm/allwinner/aw_dwc3.c
+++ b/sys/arm/allwinner/aw_dwc3.c
@@ -139,8 +139,6 @@ static device_method_t aw_dwc3_methods[] = {
DEVMETHOD_END
};
-static devclass_t aw_dwc3_devclass;
-
DEFINE_CLASS_1(aw_dwc3, aw_dwc3_driver, aw_dwc3_methods,
sizeof(struct aw_dwc3_softc), simplebus_driver);
-DRIVER_MODULE(aw_dwc3, simplebus, aw_dwc3_driver, aw_dwc3_devclass, 0, 0);
+DRIVER_MODULE(aw_dwc3, simplebus, aw_dwc3_driver, 0, 0);
diff --git a/sys/arm/allwinner/aw_gmacclk.c b/sys/arm/allwinner/aw_gmacclk.c
index 0b54f87f2984..f793cccdc88b 100644
--- a/sys/arm/allwinner/aw_gmacclk.c
+++ b/sys/arm/allwinner/aw_gmacclk.c
@@ -269,7 +269,5 @@ static driver_t aw_gmacclk_driver = {
0
};
-static devclass_t aw_gmacclk_devclass;
-
-EARLY_DRIVER_MODULE(aw_gmacclk, simplebus, aw_gmacclk_driver,
- aw_gmacclk_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(aw_gmacclk, simplebus, aw_gmacclk_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c
index 1221384fb875..e4e8a247e3c7 100644
--- a/sys/arm/allwinner/aw_gpio.c
+++ b/sys/arm/allwinner/aw_gpio.c
@@ -1475,13 +1475,11 @@ static device_method_t aw_gpio_methods[] = {
DEVMETHOD_END
};
-static devclass_t aw_gpio_devclass;
-
static driver_t aw_gpio_driver = {
"gpio",
aw_gpio_methods,
sizeof(struct aw_gpio_softc),
};
-EARLY_DRIVER_MODULE(aw_gpio, simplebus, aw_gpio_driver, aw_gpio_devclass, 0, 0,
+EARLY_DRIVER_MODULE(aw_gpio, simplebus, aw_gpio_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/allwinner/aw_i2s.c b/sys/arm/allwinner/aw_i2s.c
index d7478a443d3d..961de578110d 100644
--- a/sys/arm/allwinner/aw_i2s.c
+++ b/sys/arm/allwinner/aw_i2s.c
@@ -806,7 +806,5 @@ static driver_t aw_i2s_driver = {
sizeof(struct aw_i2s_softc),
};
-static devclass_t aw_i2s_devclass;
-
-DRIVER_MODULE(aw_i2s, simplebus, aw_i2s_driver, aw_i2s_devclass, 0, 0);
+DRIVER_MODULE(aw_i2s, simplebus, aw_i2s_driver, 0, 0);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/aw_if_dwc.c b/sys/arm/allwinner/aw_if_dwc.c
index fa1742bfeaf3..98ff55c6755a 100644
--- a/sys/arm/allwinner/aw_if_dwc.c
+++ b/sys/arm/allwinner/aw_if_dwc.c
@@ -134,12 +134,10 @@ static device_method_t a20_dwc_methods[] = {
DEVMETHOD_END
};
-static devclass_t a20_dwc_devclass;
-
extern driver_t dwc_driver;
DEFINE_CLASS_1(dwc, a20_dwc_driver, a20_dwc_methods, sizeof(struct dwc_softc),
dwc_driver);
-DRIVER_MODULE(a20_dwc, simplebus, a20_dwc_driver, a20_dwc_devclass, 0, 0);
+DRIVER_MODULE(a20_dwc, simplebus, a20_dwc_driver, 0, 0);
MODULE_DEPEND(a20_dwc, dwc, 1, 1, 1);
diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c
index 81dd34ce8c54..3decbba2e125 100644
--- a/sys/arm/allwinner/aw_mmc.c
+++ b/sys/arm/allwinner/aw_mmc.c
@@ -1510,16 +1510,13 @@ static device_method_t aw_mmc_methods[] = {
DEVMETHOD_END
};
-static devclass_t aw_mmc_devclass;
-
static driver_t aw_mmc_driver = {
"aw_mmc",
aw_mmc_methods,
sizeof(struct aw_mmc_softc),
};
-DRIVER_MODULE(aw_mmc, simplebus, aw_mmc_driver, aw_mmc_devclass, NULL,
- NULL);
+DRIVER_MODULE(aw_mmc, simplebus, aw_mmc_driver, NULL, NULL);
#ifndef MMCCAM
MMC_DECLARE_BRIDGE(aw_mmc);
#endif
diff --git a/sys/arm/allwinner/aw_nmi.c b/sys/arm/allwinner/aw_nmi.c
index d242726c29b9..d39f3765901d 100644
--- a/sys/arm/allwinner/aw_nmi.c
+++ b/sys/arm/allwinner/aw_nmi.c
@@ -414,7 +414,5 @@ static driver_t aw_nmi_driver = {
sizeof(struct aw_nmi_softc),
};
-static devclass_t aw_nmi_devclass;
-
-EARLY_DRIVER_MODULE(aw_nmi, simplebus, aw_nmi_driver,
- aw_nmi_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(aw_nmi, simplebus, aw_nmi_driver, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
diff --git a/sys/arm/allwinner/aw_pwm.c b/sys/arm/allwinner/aw_pwm.c
index a851005115f5..625edf19ebb1 100644
--- a/sys/arm/allwinner/aw_pwm.c
+++ b/sys/arm/allwinner/aw_pwm.c
@@ -398,8 +398,6 @@ static driver_t aw_pwm_driver = {
sizeof(struct aw_pwm_softc),
};
-static devclass_t aw_pwm_devclass;
-
-DRIVER_MODULE(aw_pwm, simplebus, aw_pwm_driver, aw_pwm_devclass, 0, 0);
+DRIVER_MODULE(aw_pwm, simplebus, aw_pwm_driver, 0, 0);
MODULE_VERSION(aw_pwm, 1);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/aw_r_intc.c b/sys/arm/allwinner/aw_r_intc.c
index 6d9369e12dca..c3bffb721ba6 100644
--- a/sys/arm/allwinner/aw_r_intc.c
+++ b/sys/arm/allwinner/aw_r_intc.c
@@ -287,13 +287,11 @@ static device_method_t aw_r_intc_gicp_methods[] = {
DEVMETHOD_END
};
-static devclass_t aw_r_intc_gicp_devclass;
-
static driver_t aw_r_intc_gicp_driver = {
"aw_r_intc_gicp",
aw_r_intc_gicp_methods,
sizeof(struct aw_r_intc_gicp_softc),
};
-EARLY_DRIVER_MODULE(aw_r_intc_gicp, simplebus, aw_r_intc_gicp_driver,
- aw_r_intc_gicp_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(aw_r_intc_gicp, simplebus, aw_r_intc_gicp_driver, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/aw_reset.c b/sys/arm/allwinner/aw_reset.c
index 39fbe53f2404..43467f9265e2 100644
--- a/sys/arm/allwinner/aw_reset.c
+++ b/sys/arm/allwinner/aw_reset.c
@@ -158,8 +158,6 @@ static driver_t aw_reset_driver = {
sizeof(struct aw_reset_softc),
};
-static devclass_t aw_reset_devclass;
-
-EARLY_DRIVER_MODULE(aw_reset, simplebus, aw_reset_driver, aw_reset_devclass,
- 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(aw_reset, simplebus, aw_reset_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
MODULE_VERSION(aw_reset, 1);
diff --git a/sys/arm/allwinner/aw_rsb.c b/sys/arm/allwinner/aw_rsb.c
index 504f3aa0cd1c..09ee39157200 100644
--- a/sys/arm/allwinner/aw_rsb.c
+++ b/sys/arm/allwinner/aw_rsb.c
@@ -501,11 +501,9 @@ static driver_t rsb_driver = {
sizeof(struct rsb_softc),
};
-static devclass_t rsb_devclass;
-
EARLY_DRIVER_MODULE(iicbus, rsb, iicbus_driver, 0, 0,
BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
-EARLY_DRIVER_MODULE(rsb, simplebus, rsb_driver, rsb_devclass, 0, 0,
+EARLY_DRIVER_MODULE(rsb, simplebus, rsb_driver, 0, 0,
BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
MODULE_VERSION(rsb, 1);
MODULE_DEPEND(rsb, iicbus, 1, 1, 1);
diff --git a/sys/arm/allwinner/aw_rtc.c b/sys/arm/allwinner/aw_rtc.c
index a7002234d41a..d3ff82aaec01 100644
--- a/sys/arm/allwinner/aw_rtc.c
+++ b/sys/arm/allwinner/aw_rtc.c
@@ -183,9 +183,7 @@ static driver_t aw_rtc_driver = {
sizeof(struct aw_rtc_softc),
};
-static devclass_t aw_rtc_devclass;
-
-EARLY_DRIVER_MODULE(aw_rtc, simplebus, aw_rtc_driver, aw_rtc_devclass, 0, 0,
+EARLY_DRIVER_MODULE(aw_rtc, simplebus, aw_rtc_driver, 0, 0,
BUS_PASS_RESOURCE + BUS_PASS_ORDER_FIRST);
MODULE_VERSION(aw_rtc, 1);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/aw_sid.c b/sys/arm/allwinner/aw_sid.c
index 755a8bbaab3d..b50f6016c9ca 100644
--- a/sys/arm/allwinner/aw_sid.c
+++ b/sys/arm/allwinner/aw_sid.c
@@ -404,9 +404,7 @@ static driver_t aw_sid_driver = {
sizeof(struct aw_sid_softc),
};
-static devclass_t aw_sid_devclass;
-
-EARLY_DRIVER_MODULE(aw_sid, simplebus, aw_sid_driver, aw_sid_devclass, 0, 0,
+EARLY_DRIVER_MODULE(aw_sid, simplebus, aw_sid_driver, 0, 0,
BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_FIRST);
MODULE_VERSION(aw_sid, 1);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/aw_spi.c b/sys/arm/allwinner/aw_spi.c
index bdc855cff801..77653acc1b80 100644
--- a/sys/arm/allwinner/aw_spi.c
+++ b/sys/arm/allwinner/aw_spi.c
@@ -609,9 +609,7 @@ static driver_t aw_spi_driver = {
sizeof(struct aw_spi_softc),
};
-static devclass_t aw_spi_devclass;
-
-DRIVER_MODULE(aw_spi, simplebus, aw_spi_driver, aw_spi_devclass, 0, 0);
+DRIVER_MODULE(aw_spi, simplebus, aw_spi_driver, 0, 0);
DRIVER_MODULE(ofw_spibus, aw_spi, ofw_spibus_driver, 0, 0);
MODULE_DEPEND(aw_spi, ofw_spibus, 1, 1, 1);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/aw_syscon.c b/sys/arm/allwinner/aw_syscon.c
index f1a01dac8e1b..054b906a9960 100644
--- a/sys/arm/allwinner/aw_syscon.c
+++ b/sys/arm/allwinner/aw_syscon.c
@@ -79,8 +79,7 @@ static device_method_t aw_syscon_methods[] = {
DEFINE_CLASS_1(aw_syscon, aw_syscon_driver, aw_syscon_methods,
sizeof(struct syscon_generic_softc), syscon_generic_driver);
-static devclass_t aw_syscon_devclass;
/* aw_syscon needs to attach prior to if_awg */
-EARLY_DRIVER_MODULE(aw_syscon, simplebus, aw_syscon_driver, aw_syscon_devclass,
- 0, 0, BUS_PASS_SCHEDULER + BUS_PASS_ORDER_LAST);
+EARLY_DRIVER_MODULE(aw_syscon, simplebus, aw_syscon_driver, 0, 0,
+ BUS_PASS_SCHEDULER + BUS_PASS_ORDER_LAST);
MODULE_VERSION(aw_syscon, 1);
diff --git a/sys/arm/allwinner/aw_thermal.c b/sys/arm/allwinner/aw_thermal.c
index 90836124ad66..454ce9c47e31 100644
--- a/sys/arm/allwinner/aw_thermal.c
+++ b/sys/arm/allwinner/aw_thermal.c
@@ -723,10 +723,7 @@ static driver_t aw_thermal_driver = {
sizeof(struct aw_thermal_softc),
};
-static devclass_t aw_thermal_devclass;
-
-DRIVER_MODULE(aw_thermal, simplebus, aw_thermal_driver, aw_thermal_devclass,
- 0, 0);
+DRIVER_MODULE(aw_thermal, simplebus, aw_thermal_driver, 0, 0);
MODULE_VERSION(aw_thermal, 1);
MODULE_DEPEND(aw_thermal, aw_sid, 1, 1, 1);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/arm/allwinner/aw_ts.c b/sys/arm/allwinner/aw_ts.c
index 91e51894c181..09f7dc7db30f 100644
--- a/sys/arm/allwinner/aw_ts.c
+++ b/sys/arm/allwinner/aw_ts.c
@@ -224,6 +224,5 @@ static driver_t aw_ts_driver = {
aw_ts_methods,
sizeof(struct aw_ts_softc),
};
-static devclass_t aw_ts_devclass;
-DRIVER_MODULE(aw_ts, simplebus, aw_ts_driver, aw_ts_devclass, 0, 0);
+DRIVER_MODULE(aw_ts, simplebus, aw_ts_driver, 0, 0);
diff --git a/sys/arm/allwinner/aw_usb3phy.c b/sys/arm/allwinner/aw_usb3phy.c
index 9b61f64a6448..a97c87301b2c 100644
--- a/sys/arm/allwinner/aw_usb3phy.c
+++ b/sys/arm/allwinner/aw_usb3phy.c
@@ -290,8 +290,7 @@ static driver_t awusb3phy_driver = {
sizeof(struct awusb3phy_softc)
};
-static devclass_t awusb3phy_devclass;
/* aw_usb3phy needs to come up after regulators/gpio/etc, but before ehci/ohci */
-EARLY_DRIVER_MODULE(awusb3phy, simplebus, awusb3phy_driver, awusb3phy_devclass,
- 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(awusb3phy, simplebus, awusb3phy_driver, 0, 0,
+ BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
MODULE_VERSION(awusb3phy, 1);
diff --git a/sys/arm/allwinner/aw_usbphy.c b/sys/arm/allwinner/aw_usbphy.c
index b0fd24a81eee..b7dd6af48d60 100644
--- a/sys/arm/allwinner/aw_usbphy.c
+++ b/sys/arm/allwinner/aw_usbphy.c
@@ -523,8 +523,7 @@ static driver_t awusbphy_driver = {
sizeof(struct awusbphy_softc)
};
-static devclass_t awusbphy_devclass;
/* aw_usbphy needs to come up after regulators/gpio/etc, but before ehci/ohci */
-EARLY_DRIVER_MODULE(awusbphy, simplebus, awusbphy_driver, awusbphy_devclass,
- 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(awusbphy, simplebus, awusbphy_driver, 0, 0,
+ BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
MODULE_VERSION(awusbphy, 1);
diff --git a/sys/arm/allwinner/aw_wdog.c b/sys/arm/allwinner/aw_wdog.c
index 4e7af4ef25d6..4b65635c571b 100644
--- a/sys/arm/allwinner/aw_wdog.c
+++ b/sys/arm/allwinner/aw_wdog.c
@@ -295,6 +295,5 @@ static driver_t aw_wdog_driver = {
aw_wdog_methods,
sizeof(struct aw_wdog_softc),
};
-static devclass_t aw_wdog_devclass;
-DRIVER_MODULE(aw_wdog, simplebus, aw_wdog_driver, aw_wdog_devclass, 0, 0);
+DRIVER_MODULE(aw_wdog, simplebus, aw_wdog_driver, 0, 0);
diff --git a/sys/arm/allwinner/axp209.c b/sys/arm/allwinner/axp209.c
index 2dda6cb558c2..9d5d31f92010 100644
--- a/sys/arm/allwinner/axp209.c
+++ b/sys/arm/allwinner/axp209.c
@@ -1410,11 +1410,10 @@ static driver_t axp2xx_driver = {
sizeof(struct axp2xx_softc),
};
-static devclass_t axp2xx_devclass;
extern driver_t ofw_gpiobus_driver, gpioc_driver;
-EARLY_DRIVER_MODULE(axp2xx, iicbus, axp2xx_driver, axp2xx_devclass,
- 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(axp2xx, iicbus, axp2xx_driver, 0, 0,
+ BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
EARLY_DRIVER_MODULE(ofw_gpiobus, axp2xx_pmu, ofw_gpiobus_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
DRIVER_MODULE(gpioc, axp2xx_pmu, gpioc_driver, 0, 0);
diff --git a/sys/arm/allwinner/axp81x.c b/sys/arm/allwinner/axp81x.c
index 17c74b244ded..fcbfb5909874 100644
--- a/sys/arm/allwinner/axp81x.c
+++ b/sys/arm/allwinner/axp81x.c
@@ -1651,10 +1651,9 @@ static driver_t axp8xx_driver = {
sizeof(struct axp8xx_softc),
};
-static devclass_t axp8xx_devclass;
extern driver_t ofw_gpiobus_driver, gpioc_driver;
-EARLY_DRIVER_MODULE(axp8xx, iicbus, axp8xx_driver, axp8xx_devclass, 0, 0,
+EARLY_DRIVER_MODULE(axp8xx, iicbus, axp8xx_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
EARLY_DRIVER_MODULE(ofw_gpiobus, axp8xx_pmu, ofw_gpiobus_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
diff --git a/sys/arm/allwinner/clkng/ccu_a10.c b/sys/arm/allwinner/clkng/ccu_a10.c
index 182a19f35e98..7e4e268f7164 100644
--- a/sys/arm/allwinner/clkng/ccu_a10.c
+++ b/sys/arm/allwinner/clkng/ccu_a10.c
@@ -616,10 +616,8 @@ static device_method_t ccu_a10ng_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_a10ng_devclass;
-
DEFINE_CLASS_1(ccu_a10ng, ccu_a10ng_driver, ccu_a10ng_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_a10ng, simplebus, ccu_a10ng_driver,
- ccu_a10ng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_a10ng, simplebus, ccu_a10ng_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_a13.c b/sys/arm/allwinner/clkng/ccu_a13.c
index dbe4e1364f14..827cab1b7910 100644
--- a/sys/arm/allwinner/clkng/ccu_a13.c
+++ b/sys/arm/allwinner/clkng/ccu_a13.c
@@ -561,10 +561,8 @@ static device_method_t ccu_a13ng_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_a13ng_devclass;
-
DEFINE_CLASS_1(ccu_a13ng, ccu_a13ng_driver, ccu_a13ng_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_a13ng, simplebus, ccu_a13ng_driver,
- ccu_a13ng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_a13ng, simplebus, ccu_a13ng_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_a31.c b/sys/arm/allwinner/clkng/ccu_a31.c
index b19bebfe1786..d06cd0af3e1d 100644
--- a/sys/arm/allwinner/clkng/ccu_a31.c
+++ b/sys/arm/allwinner/clkng/ccu_a31.c
@@ -971,10 +971,8 @@ static device_method_t ccu_a31ng_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_a31ng_devclass;
-
DEFINE_CLASS_1(ccu_a31ng, ccu_a31ng_driver, ccu_a31ng_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_a31ng, simplebus, ccu_a31ng_driver,
- ccu_a31ng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_a31ng, simplebus, ccu_a31ng_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_a64.c b/sys/arm/allwinner/clkng/ccu_a64.c
index 41f531596475..75c8377b3238 100644
--- a/sys/arm/allwinner/clkng/ccu_a64.c
+++ b/sys/arm/allwinner/clkng/ccu_a64.c
@@ -834,10 +834,8 @@ static device_method_t ccu_a64ng_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_a64ng_devclass;
-
DEFINE_CLASS_1(ccu_a64ng, ccu_a64ng_driver, ccu_a64ng_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_a64ng, simplebus, ccu_a64ng_driver,
- ccu_a64ng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_a64ng, simplebus, ccu_a64ng_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_a83t.c b/sys/arm/allwinner/clkng/ccu_a83t.c
index c32b1d624161..6e004c2a4e89 100644
--- a/sys/arm/allwinner/clkng/ccu_a83t.c
+++ b/sys/arm/allwinner/clkng/ccu_a83t.c
@@ -779,10 +779,8 @@ static device_method_t ccu_a83tng_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_a83tng_devclass;
-
DEFINE_CLASS_1(ccu_a83tng, ccu_a83tng_driver, ccu_a83tng_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_a83tng, simplebus, ccu_a83tng_driver,
- ccu_a83tng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_a83tng, simplebus, ccu_a83tng_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_de2.c b/sys/arm/allwinner/clkng/ccu_de2.c
index 84a2681abeb9..efcbbc524c83 100644
--- a/sys/arm/allwinner/clkng/ccu_de2.c
+++ b/sys/arm/allwinner/clkng/ccu_de2.c
@@ -231,10 +231,8 @@ static device_method_t ccu_de2_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_de2ng_devclass;
-
DEFINE_CLASS_1(ccu_de2, ccu_de2_driver, ccu_de2_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_de2, simplebus, ccu_de2_driver,
- ccu_de2ng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_LAST);
+EARLY_DRIVER_MODULE(ccu_de2, simplebus, ccu_de2_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_LAST);
diff --git a/sys/arm/allwinner/clkng/ccu_h3.c b/sys/arm/allwinner/clkng/ccu_h3.c
index 72e257c98d73..c911497b3d3c 100644
--- a/sys/arm/allwinner/clkng/ccu_h3.c
+++ b/sys/arm/allwinner/clkng/ccu_h3.c
@@ -785,10 +785,8 @@ static device_method_t ccu_h3ng_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_h3ng_devclass;
-
DEFINE_CLASS_1(ccu_h3ng, ccu_h3ng_driver, ccu_h3ng_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_h3ng, simplebus, ccu_h3ng_driver,
- ccu_h3ng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_h3ng, simplebus, ccu_h3ng_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_h6.c b/sys/arm/allwinner/clkng/ccu_h6.c
index dbecaaff0e6b..8ca8ba75f584 100644
--- a/sys/arm/allwinner/clkng/ccu_h6.c
+++ b/sys/arm/allwinner/clkng/ccu_h6.c
@@ -492,10 +492,8 @@ static device_method_t ccu_h6ng_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_h6ng_devclass;
-
DEFINE_CLASS_1(ccu_h6ng, ccu_h6ng_driver, ccu_h6ng_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_h6ng, simplebus, ccu_h6ng_driver,
- ccu_h6ng_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_h6ng, simplebus, ccu_h6ng_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_h6_r.c b/sys/arm/allwinner/clkng/ccu_h6_r.c
index 1f1ca8c1054a..a7ef82f55092 100644
--- a/sys/arm/allwinner/clkng/ccu_h6_r.c
+++ b/sys/arm/allwinner/clkng/ccu_h6_r.c
@@ -163,10 +163,8 @@ static device_method_t ccu_sun50i_h6_r_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_sun50i_h6_r_devclass;
-
DEFINE_CLASS_1(ccu_sun50i_h6_r, ccu_sun50i_h6_r_driver, ccu_sun50i_h6_r_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_sun50i_h6_r, simplebus, ccu_sun50i_h6_r_driver,
- ccu_sun50i_h6_r_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_sun50i_h6_r, simplebus, ccu_sun50i_h6_r_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/clkng/ccu_sun8i_r.c b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
index 05558f4dc73e..c58375ab5184 100644
--- a/sys/arm/allwinner/clkng/ccu_sun8i_r.c
+++ b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
@@ -209,13 +209,11 @@ static device_method_t ccu_sun8i_r_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_sun8i_r_devclass;
-
DEFINE_CLASS_1(ccu_sun8i_r, ccu_sun8i_r_driver, ccu_sun8i_r_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_sun8i_r, simplebus, ccu_sun8i_r_driver,
- ccu_sun8i_r_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_sun8i_r, simplebus, ccu_sun8i_r_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
static int
ccu_a83t_r_probe(device_t dev)
@@ -256,10 +254,8 @@ static device_method_t ccu_a83t_r_methods[] = {
DEVMETHOD_END
};
-static devclass_t ccu_a83t_r_devclass;
-
DEFINE_CLASS_1(ccu_a83t_r, ccu_a83t_r_driver, ccu_a83t_r_methods,
sizeof(struct aw_ccung_softc), aw_ccung_driver);
-EARLY_DRIVER_MODULE(ccu_a83t_r, simplebus, ccu_a83t_r_driver,
- ccu_a83t_r_devclass, 0, 0, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(ccu_a83t_r, simplebus, ccu_a83t_r_driver, 0, 0,
+ BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c
index 029759fe42ba..7236bd94335d 100644
--- a/sys/arm/allwinner/if_awg.c
+++ b/sys/arm/allwinner/if_awg.c
@@ -2015,9 +2015,7 @@ static driver_t awg_driver = {
sizeof(struct awg_softc),
};
-static devclass_t awg_devclass;
-
-DRIVER_MODULE(awg, simplebus, awg_driver, awg_devclass, 0, 0);
+DRIVER_MODULE(awg, simplebus, awg_driver, 0, 0);
DRIVER_MODULE(miibus, awg, miibus_driver, 0, 0);
MODULE_DEPEND(awg, ether, 1, 1, 1);
MODULE_DEPEND(awg, miibus, 1, 1, 1);
diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
index 8b49580516b0..8f2bd7222a6a 100644
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -1168,9 +1168,7 @@ static driver_t emac_driver = {
sizeof(struct emac_softc)
};
-static devclass_t emac_devclass;
-
-DRIVER_MODULE(emac, simplebus, emac_driver, emac_devclass, 0, 0);
+DRIVER_MODULE(emac, simplebus, emac_driver, 0, 0);
DRIVER_MODULE(miibus, emac, miibus_driver, 0, 0);
MODULE_DEPEND(emac, miibus, 1, 1, 1);
MODULE_DEPEND(emac, ether, 1, 1, 1);