diff --git a/sys/dev/bwi/if_bwi_pci.c b/sys/dev/bwi/if_bwi_pci.c
index d82b7d4d60de..fa87d003f1b2 100644
--- a/sys/dev/bwi/if_bwi_pci.c
+++ b/sys/dev/bwi/if_bwi_pci.c
@@ -248,13 +248,14 @@ static device_method_t bwi_pci_methods[] = {
 	DEVMETHOD(device_resume,	bwi_pci_resume),
 	{ 0,0 }
 };
+
 static driver_t bwi_driver = {
 	"bwi",
 	bwi_pci_methods,
 	sizeof (struct bwi_pci_softc)
 };
-static	devclass_t bwi_devclass;
-DRIVER_MODULE(bwi, pci, bwi_driver, bwi_devclass, 0, 0);
+
+DRIVER_MODULE(bwi, pci, bwi_driver, 0, 0);
 MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, bwi, bwi_devices,
     nitems(bwi_devices) - 1);
 MODULE_DEPEND(bwi, wlan, 1, 1, 1);		/* 802.11 media layer */
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index 1dc38dbcae6c..b911ac137d82 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -7738,13 +7738,14 @@ static device_method_t bwn_methods[] = {
 	DEVMETHOD(device_resume,	bwn_resume),
 	DEVMETHOD_END
 };
+
 static driver_t bwn_driver = {
 	"bwn",
 	bwn_methods,
 	sizeof(struct bwn_softc)
 };
-static devclass_t bwn_devclass;
-DRIVER_MODULE(bwn, bhnd, bwn_driver, bwn_devclass, 0, 0);
+
+DRIVER_MODULE(bwn, bhnd, bwn_driver, 0, 0);
 MODULE_DEPEND(bwn, bhnd, 1, 1, 1);
 MODULE_DEPEND(bwn, gpiobus, 1, 1, 1);
 MODULE_DEPEND(bwn, wlan, 1, 1, 1);		/* 802.11 media layer */
diff --git a/sys/dev/bwn/if_bwn_pci.c b/sys/dev/bwn/if_bwn_pci.c
index 63f3f78a18f1..09e3c95fd87b 100644
--- a/sys/dev/bwn/if_bwn_pci.c
+++ b/sys/dev/bwn/if_bwn_pci.c
@@ -287,12 +287,9 @@ static device_method_t bwn_pci_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t bwn_pci_devclass;
-
 DEFINE_CLASS_0(bwn_pci, bwn_pci_driver, bwn_pci_methods,
     sizeof(struct bwn_pci_softc));
-DRIVER_MODULE_ORDERED(bwn_pci, pci, bwn_pci_driver, bwn_pci_devclass, NULL,
-    NULL, SI_ORDER_ANY);
+DRIVER_MODULE_ORDERED(bwn_pci, pci, bwn_pci_driver, NULL, NULL, SI_ORDER_ANY);
 MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, bwn_siba,
     siba_devices, nitems(siba_devices) - 1);
 MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, bwn_bcma,