Index: sys/dev/cxgbe/t4_iov.c
===================================================================
--- sys/dev/cxgbe/t4_iov.c
+++ sys/dev/cxgbe/t4_iov.c
@@ -425,13 +425,11 @@
 	sizeof(struct t4iov_softc)
 };
 
-static devclass_t t4iov_devclass, t5iov_devclass, t6iov_devclass;
-
-DRIVER_MODULE(t4iov, pci, t4iov_driver, t4iov_devclass, 0, 0);
+DRIVER_MODULE(t4iov, pci, t4iov_driver, 0, 0);
 MODULE_VERSION(t4iov, 1);
 
-DRIVER_MODULE(t5iov, pci, t5iov_driver, t5iov_devclass, 0, 0);
+DRIVER_MODULE(t5iov, pci, t5iov_driver, 0, 0);
 MODULE_VERSION(t5iov, 1);
 
-DRIVER_MODULE(t6iov, pci, t6iov_driver, t6iov_devclass, 0, 0);
+DRIVER_MODULE(t6iov, pci, t6iov_driver, 0, 0);
 MODULE_VERSION(t6iov, 1);
Index: sys/dev/cxgbe/t4_main.c
===================================================================
--- sys/dev/cxgbe/t4_main.c
+++ sys/dev/cxgbe/t4_main.c
@@ -13187,45 +13187,41 @@
 	return (rc);
 }
 
-static devclass_t t4_devclass, t5_devclass, t6_devclass;
-static devclass_t cxgbe_devclass, cxl_devclass, cc_devclass;
-static devclass_t vcxgbe_devclass, vcxl_devclass, vcc_devclass;
-
-DRIVER_MODULE(t4nex, pci, t4_driver, t4_devclass, mod_event, 0);
+DRIVER_MODULE(t4nex, pci, t4_driver, mod_event, 0);
 MODULE_VERSION(t4nex, 1);
 MODULE_DEPEND(t4nex, firmware, 1, 1, 1);
 #ifdef DEV_NETMAP
 MODULE_DEPEND(t4nex, netmap, 1, 1, 1);
 #endif /* DEV_NETMAP */
 
-DRIVER_MODULE(t5nex, pci, t5_driver, t5_devclass, mod_event, 0);
+DRIVER_MODULE(t5nex, pci, t5_driver, mod_event, 0);
 MODULE_VERSION(t5nex, 1);
 MODULE_DEPEND(t5nex, firmware, 1, 1, 1);
 #ifdef DEV_NETMAP
 MODULE_DEPEND(t5nex, netmap, 1, 1, 1);
 #endif /* DEV_NETMAP */
 
-DRIVER_MODULE(t6nex, pci, t6_driver, t6_devclass, mod_event, 0);
+DRIVER_MODULE(t6nex, pci, t6_driver, mod_event, 0);
 MODULE_VERSION(t6nex, 1);
 MODULE_DEPEND(t6nex, firmware, 1, 1, 1);
 #ifdef DEV_NETMAP
 MODULE_DEPEND(t6nex, netmap, 1, 1, 1);
 #endif /* DEV_NETMAP */
 
-DRIVER_MODULE(cxgbe, t4nex, cxgbe_driver, cxgbe_devclass, 0, 0);
+DRIVER_MODULE(cxgbe, t4nex, cxgbe_driver, 0, 0);
 MODULE_VERSION(cxgbe, 1);
 
-DRIVER_MODULE(cxl, t5nex, cxl_driver, cxl_devclass, 0, 0);
+DRIVER_MODULE(cxl, t5nex, cxl_driver, 0, 0);
 MODULE_VERSION(cxl, 1);
 
-DRIVER_MODULE(cc, t6nex, cc_driver, cc_devclass, 0, 0);
+DRIVER_MODULE(cc, t6nex, cc_driver, 0, 0);
 MODULE_VERSION(cc, 1);
 
-DRIVER_MODULE(vcxgbe, cxgbe, vcxgbe_driver, vcxgbe_devclass, 0, 0);
+DRIVER_MODULE(vcxgbe, cxgbe, vcxgbe_driver, 0, 0);
 MODULE_VERSION(vcxgbe, 1);
 
-DRIVER_MODULE(vcxl, cxl, vcxl_driver, vcxl_devclass, 0, 0);
+DRIVER_MODULE(vcxl, cxl, vcxl_driver, 0, 0);
 MODULE_VERSION(vcxl, 1);
 
-DRIVER_MODULE(vcc, cc, vcc_driver, vcc_devclass, 0, 0);
+DRIVER_MODULE(vcc, cc, vcc_driver, 0, 0);
 MODULE_VERSION(vcc, 1);
Index: sys/dev/cxgbe/t4_vf.c
===================================================================
--- sys/dev/cxgbe/t4_vf.c
+++ sys/dev/cxgbe/t4_vf.c
@@ -975,26 +975,23 @@
 	sizeof(struct port_info)
 };
 
-static devclass_t t4vf_devclass, t5vf_devclass, t6vf_devclass;
-static devclass_t cxgbev_devclass, cxlv_devclass, ccv_devclass;
-
-DRIVER_MODULE(t4vf, pci, t4vf_driver, t4vf_devclass, 0, 0);
+DRIVER_MODULE(t4vf, pci, t4vf_driver, 0, 0);
 MODULE_VERSION(t4vf, 1);
 MODULE_DEPEND(t4vf, t4nex, 1, 1, 1);
 
-DRIVER_MODULE(t5vf, pci, t5vf_driver, t5vf_devclass, 0, 0);
+DRIVER_MODULE(t5vf, pci, t5vf_driver, 0, 0);
 MODULE_VERSION(t5vf, 1);
 MODULE_DEPEND(t5vf, t5nex, 1, 1, 1);
 
-DRIVER_MODULE(t6vf, pci, t6vf_driver, t6vf_devclass, 0, 0);
+DRIVER_MODULE(t6vf, pci, t6vf_driver, 0, 0);
 MODULE_VERSION(t6vf, 1);
 MODULE_DEPEND(t6vf, t6nex, 1, 1, 1);
 
-DRIVER_MODULE(cxgbev, t4vf, cxgbev_driver, cxgbev_devclass, 0, 0);
+DRIVER_MODULE(cxgbev, t4vf, cxgbev_driver, 0, 0);
 MODULE_VERSION(cxgbev, 1);
 
-DRIVER_MODULE(cxlv, t5vf, cxlv_driver, cxlv_devclass, 0, 0);
+DRIVER_MODULE(cxlv, t5vf, cxlv_driver, 0, 0);
 MODULE_VERSION(cxlv, 1);
 
-DRIVER_MODULE(ccv, t6vf, ccv_driver, ccv_devclass, 0, 0);
+DRIVER_MODULE(ccv, t6vf, ccv_driver, 0, 0);
 MODULE_VERSION(ccv, 1);