diff --git a/sys/arm/annapurna/alpine/alpine_ccu.c b/sys/arm/annapurna/alpine/alpine_ccu.c
index 1e99cb5bf67e..3535ee28d945 100644
--- a/sys/arm/annapurna/alpine/alpine_ccu.c
+++ b/sys/arm/annapurna/alpine/alpine_ccu.c
@@ -71,12 +71,10 @@ static driver_t al_ccu_driver = {
 	sizeof(struct al_ccu_softc)
 };
 
-static devclass_t al_ccu_devclass;
-
-EARLY_DRIVER_MODULE(al_ccu, simplebus, al_ccu_driver,
-    al_ccu_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
-EARLY_DRIVER_MODULE(al_ccu, ofwbus, al_ccu_driver,
-    al_ccu_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(al_ccu, simplebus, al_ccu_driver, 0, 0,
+    BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(al_ccu, ofwbus, al_ccu_driver, 0, 0,
+    BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
 
 static int
 al_ccu_probe(device_t dev)
diff --git a/sys/arm/annapurna/alpine/alpine_nb_service.c b/sys/arm/annapurna/alpine/alpine_nb_service.c
index 156d8e406df5..a428b6553652 100644
--- a/sys/arm/annapurna/alpine/alpine_nb_service.c
+++ b/sys/arm/annapurna/alpine/alpine_nb_service.c
@@ -70,12 +70,10 @@ static driver_t nb_service_driver = {
 	sizeof(struct nb_service_softc)
 };
 
-static devclass_t nb_service_devclass;
-
-EARLY_DRIVER_MODULE(nb_service, simplebus, nb_service_driver,
-    nb_service_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
-EARLY_DRIVER_MODULE(nb_service, ofwbus, nb_service_driver,
-    nb_service_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(nb_service, simplebus, nb_service_driver, 0, 0,
+    BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(nb_service, ofwbus, nb_service_driver, 0, 0,
+    BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
 
 static int
 nb_service_probe(device_t dev)
diff --git a/sys/arm/annapurna/alpine/alpine_pci.c b/sys/arm/annapurna/alpine/alpine_pci.c
index 043ae19e0cb3..d031587b5283 100644
--- a/sys/arm/annapurna/alpine/alpine_pci.c
+++ b/sys/arm/annapurna/alpine/alpine_pci.c
@@ -82,10 +82,8 @@ static device_method_t al_pcib_methods[] = {
 DEFINE_CLASS_1(pcib, al_pcib_driver, al_pcib_methods,
     sizeof(struct generic_pcie_fdt_softc), generic_pcie_fdt_driver);
 
-static devclass_t anpa_pcib_devclass;
-
-DRIVER_MODULE(alpine_pcib, simplebus, al_pcib_driver, anpa_pcib_devclass, 0, 0);
-DRIVER_MODULE(alpine_pcib, ofwbus, al_pcib_driver, anpa_pcib_devclass, 0, 0);
+DRIVER_MODULE(alpine_pcib, simplebus, al_pcib_driver, 0, 0);
+DRIVER_MODULE(alpine_pcib, ofwbus, al_pcib_driver, 0, 0);
 
 static int
 al_pcib_probe(device_t dev)
diff --git a/sys/arm/annapurna/alpine/alpine_pci_msix.c b/sys/arm/annapurna/alpine/alpine_pci_msix.c
index a988a00d1912..d7815ea52da8 100644
--- a/sys/arm/annapurna/alpine/alpine_pci_msix.c
+++ b/sys/arm/annapurna/alpine/alpine_pci_msix.c
@@ -107,10 +107,8 @@ static driver_t al_msix_driver = {
 	sizeof(struct al_msix_softc),
 };
 
-devclass_t al_msix_devclass;
-
-DRIVER_MODULE(al_msix, ofwbus, al_msix_driver, al_msix_devclass, 0, 0);
-DRIVER_MODULE(al_msix, simplebus, al_msix_driver, al_msix_devclass, 0, 0);
+DRIVER_MODULE(al_msix, ofwbus, al_msix_driver, 0, 0);
+DRIVER_MODULE(al_msix, simplebus, al_msix_driver, 0, 0);
 
 MALLOC_DECLARE(M_AL_MSIX);
 MALLOC_DEFINE(M_AL_MSIX, "al_msix", "Alpine MSIX");
diff --git a/sys/arm/annapurna/alpine/alpine_serdes.c b/sys/arm/annapurna/alpine/alpine_serdes.c
index 882b01a8da4f..f0affbc26795 100644
--- a/sys/arm/annapurna/alpine/alpine_serdes.c
+++ b/sys/arm/annapurna/alpine/alpine_serdes.c
@@ -82,12 +82,8 @@ static driver_t al_serdes_driver = {
 	sizeof(struct al_serdes_softc)
 };
 
-static devclass_t al_serdes_devclass;
-
-DRIVER_MODULE(al_serdes, simplebus, al_serdes_driver,
-    al_serdes_devclass, 0, 0);
-DRIVER_MODULE(al_serdes, ofwbus, al_serdes_driver,
-    al_serdes_devclass, 0, 0);
+DRIVER_MODULE(al_serdes, simplebus, al_serdes_driver, 0, 0);
+DRIVER_MODULE(al_serdes, ofwbus, al_serdes_driver, 0, 0);
 
 static int
 al_serdes_probe(device_t dev)