9 files changed, 16 insertions, 36 deletions

diff --git a/sys/arm64/coresight/coresight_cpu_debug.c b/sys/arm64/coresight/coresight_cpu_debug.c
index c28db5fd51c7..3f41ad209495 100644
--- a/sys/arm64/coresight/coresight_cpu_debug.c
+++ b/sys/arm64/coresight/coresight_cpu_debug.c
@@ -157,8 +157,6 @@ static driver_t debug_driver = {
 	sizeof(struct debug_softc),
 };
 
-static devclass_t debug_devclass;
-
-EARLY_DRIVER_MODULE(debug, simplebus, debug_driver, debug_devclass,
-    0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
+EARLY_DRIVER_MODULE(debug, simplebus, debug_driver, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
 MODULE_VERSION(debug, 1);
diff --git a/sys/arm64/coresight/coresight_etm4x_acpi.c b/sys/arm64/coresight/coresight_etm4x_acpi.c
index 93dfd7a4f880..0806bd6aedca 100644
--- a/sys/arm64/coresight/coresight_etm4x_acpi.c
+++ b/sys/arm64/coresight/coresight_etm4x_acpi.c
@@ -86,7 +86,5 @@ static device_method_t etm_acpi_methods[] = {
 DEFINE_CLASS_1(etm, etm_acpi_driver, etm_acpi_methods,
     sizeof(struct etm_softc), etm_driver);
 
-static devclass_t etm_acpi_devclass;
-
-EARLY_DRIVER_MODULE(etm, acpi, etm_acpi_driver, etm_acpi_devclass,
-    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(etm, acpi, etm_acpi_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/coresight/coresight_etm4x_fdt.c b/sys/arm64/coresight/coresight_etm4x_fdt.c
index b3418e538a47..7be45ab09ae3 100644
--- a/sys/arm64/coresight/coresight_etm4x_fdt.c
+++ b/sys/arm64/coresight/coresight_etm4x_fdt.c
@@ -88,7 +88,5 @@ static device_method_t etm_fdt_methods[] = {
 DEFINE_CLASS_1(etm, etm_fdt_driver, etm_fdt_methods,
     sizeof(struct etm_softc), etm_driver);
 
-static devclass_t etm_fdt_devclass;
-
-EARLY_DRIVER_MODULE(etm, simplebus, etm_fdt_driver, etm_fdt_devclass,
-    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(etm, simplebus, etm_fdt_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/coresight/coresight_funnel_acpi.c b/sys/arm64/coresight/coresight_funnel_acpi.c
index 0757af3d1ce0..f3117d268f5a 100644
--- a/sys/arm64/coresight/coresight_funnel_acpi.c
+++ b/sys/arm64/coresight/coresight_funnel_acpi.c
@@ -102,7 +102,5 @@ static device_method_t funnel_acpi_methods[] = {
 DEFINE_CLASS_1(funnel, funnel_acpi_driver, funnel_acpi_methods,
     sizeof(struct funnel_softc), funnel_driver);
 
-static devclass_t funnel_acpi_devclass;
-
-EARLY_DRIVER_MODULE(funnel, acpi, funnel_acpi_driver, funnel_acpi_devclass,
-    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(funnel, acpi, funnel_acpi_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/coresight/coresight_funnel_fdt.c b/sys/arm64/coresight/coresight_funnel_fdt.c
index c3cbad2224d8..bfc78e648bb6 100644
--- a/sys/arm64/coresight/coresight_funnel_fdt.c
+++ b/sys/arm64/coresight/coresight_funnel_fdt.c
@@ -100,7 +100,5 @@ static device_method_t funnel_fdt_methods[] = {
 DEFINE_CLASS_1(funnel, funnel_fdt_driver, funnel_fdt_methods,
     sizeof(struct funnel_softc), funnel_driver);
 
-static devclass_t funnel_fdt_devclass;
-
-EARLY_DRIVER_MODULE(funnel, simplebus, funnel_fdt_driver, funnel_fdt_devclass,
-    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(funnel, simplebus, funnel_fdt_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/coresight/coresight_replicator_acpi.c b/sys/arm64/coresight/coresight_replicator_acpi.c
index 7cc08930c81f..84a3dff90b6b 100644
--- a/sys/arm64/coresight/coresight_replicator_acpi.c
+++ b/sys/arm64/coresight/coresight_replicator_acpi.c
@@ -87,8 +87,5 @@ static device_method_t replicator_acpi_methods[] = {
 DEFINE_CLASS_1(replicator, replicator_acpi_driver, replicator_acpi_methods,
     sizeof(struct replicator_softc), replicator_driver);
 
-static devclass_t replicator_acpi_devclass;
-
-EARLY_DRIVER_MODULE(replicator, acpi, replicator_acpi_driver,
-    replicator_acpi_devclass, 0, 0,
+EARLY_DRIVER_MODULE(replicator, acpi, replicator_acpi_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/coresight/coresight_replicator_fdt.c b/sys/arm64/coresight/coresight_replicator_fdt.c
index 6744880369b1..2f550a62d7c2 100644
--- a/sys/arm64/coresight/coresight_replicator_fdt.c
+++ b/sys/arm64/coresight/coresight_replicator_fdt.c
@@ -88,8 +88,5 @@ static device_method_t replicator_fdt_methods[] = {
 DEFINE_CLASS_1(replicator, replicator_fdt_driver, replicator_fdt_methods,
     sizeof(struct replicator_softc), replicator_driver);
 
-static devclass_t replicator_fdt_devclass;
-
-EARLY_DRIVER_MODULE(replicator, simplebus, replicator_fdt_driver,
-    replicator_fdt_devclass, 0, 0,
+EARLY_DRIVER_MODULE(replicator, simplebus, replicator_fdt_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/coresight/coresight_tmc_acpi.c b/sys/arm64/coresight/coresight_tmc_acpi.c
index 020306593fc8..f5b32175ca49 100644
--- a/sys/arm64/coresight/coresight_tmc_acpi.c
+++ b/sys/arm64/coresight/coresight_tmc_acpi.c
@@ -86,7 +86,5 @@ static device_method_t tmc_acpi_methods[] = {
 DEFINE_CLASS_1(tmc, tmc_acpi_driver, tmc_acpi_methods,
     sizeof(struct tmc_softc), tmc_driver);
 
-static devclass_t tmc_acpi_devclass;
-
-EARLY_DRIVER_MODULE(tmc, acpi, tmc_acpi_driver, tmc_acpi_devclass,
-    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(tmc, acpi, tmc_acpi_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm64/coresight/coresight_tmc_fdt.c b/sys/arm64/coresight/coresight_tmc_fdt.c
index 6b057231e208..c99d0c58eee4 100644
--- a/sys/arm64/coresight/coresight_tmc_fdt.c
+++ b/sys/arm64/coresight/coresight_tmc_fdt.c
@@ -88,7 +88,5 @@ static device_method_t tmc_fdt_methods[] = {
 DEFINE_CLASS_1(tmc, tmc_fdt_driver, tmc_fdt_methods,
     sizeof(struct tmc_softc), tmc_driver);
 
-static devclass_t tmc_fdt_devclass;
-
-EARLY_DRIVER_MODULE(tmc, simplebus, tmc_fdt_driver, tmc_fdt_devclass,
-    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(tmc, simplebus, tmc_fdt_driver, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);