diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index a10538457974..bac39be747e3 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -235,7 +235,7 @@ static driver_t cpswp_driver = {
 static devclass_t cpswp_devclass;
 
 #ifdef CPSW_ETHERSWITCH
-DRIVER_MODULE(etherswitch, cpswss, etherswitch_driver, etherswitch_devclass, 0, 0);
+DRIVER_MODULE(etherswitch, cpswss, etherswitch_driver, 0, 0);
 MODULE_DEPEND(cpswss, etherswitch, 1, 1, 1);
 #endif
 
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_main.c b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
index 9daf2e355469..ec31d5cd9d5d 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_main.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
@@ -961,7 +961,7 @@ DRIVER_MODULE(ar40xx, simplebus, ar40xx_driver, ar40xx_devclass, 0, 0);
 DRIVER_MODULE(ar40xx, ofwbus, ar40xx_driver, ar40xx_devclass, 0, 0);
 DRIVER_MODULE(miibus, ar40xx, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, ar40xx, mdio_driver, 0, 0);
-DRIVER_MODULE(etherswitch, ar40xx, etherswitch_driver, etherswitch_devclass, 0, 0);
+DRIVER_MODULE(etherswitch, ar40xx, etherswitch_driver, 0, 0);
 MODULE_DEPEND(ar40xx, mdio, 1, 1, 1);
 MODULE_DEPEND(ar40xx, miibus, 1, 1, 1);
 MODULE_DEPEND(ar40xx, etherswitch, 1, 1, 1);
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 7202d22f1582..eb4c9630e099 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -1349,7 +1349,7 @@ static devclass_t arswitch_devclass;
 DRIVER_MODULE(arswitch, mdio, arswitch_driver, arswitch_devclass, 0, 0);
 DRIVER_MODULE(miibus, arswitch, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, arswitch, mdio_driver, 0, 0);
-DRIVER_MODULE(etherswitch, arswitch, etherswitch_driver, etherswitch_devclass, 0, 0);
+DRIVER_MODULE(etherswitch, arswitch, etherswitch_driver, 0, 0);
 MODULE_VERSION(arswitch, 1);
 MODULE_DEPEND(arswitch, miibus, 1, 1, 1); /* XXX which versions? */
 MODULE_DEPEND(arswitch, etherswitch, 1, 1, 1); /* XXX which versions? */
diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c
index b93f278ed432..bd7575b21443 100644
--- a/sys/dev/etherswitch/e6000sw/e6000sw.c
+++ b/sys/dev/etherswitch/e6000sw/e6000sw.c
@@ -186,8 +186,7 @@ DEFINE_CLASS_0(e6000sw, e6000sw_driver, e6000sw_methods,
     sizeof(e6000sw_softc_t));
 
 DRIVER_MODULE(e6000sw, mdio, e6000sw_driver, e6000sw_devclass, 0, 0);
-DRIVER_MODULE(etherswitch, e6000sw, etherswitch_driver, etherswitch_devclass, 0,
-    0);
+DRIVER_MODULE(etherswitch, e6000sw, etherswitch_driver, 0, 0);
 DRIVER_MODULE(miibus, e6000sw, miibus_driver, 0, 0);
 MODULE_DEPEND(e6000sw, mdio, 1, 1, 1);
 
diff --git a/sys/dev/etherswitch/e6000sw/e6060sw.c b/sys/dev/etherswitch/e6000sw/e6060sw.c
index 66cfa7007318..b1af8151c978 100644
--- a/sys/dev/etherswitch/e6000sw/e6060sw.c
+++ b/sys/dev/etherswitch/e6000sw/e6060sw.c
@@ -1027,7 +1027,7 @@ static devclass_t e6060sw_devclass;
 DRIVER_MODULE(e6060sw, mdio, e6060sw_driver, e6060sw_devclass, 0, 0);
 DRIVER_MODULE(miibus, e6060sw, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, e6060sw, mdio_driver, 0, 0);
-DRIVER_MODULE(etherswitch, e6060sw, etherswitch_driver, etherswitch_devclass, 0, 0);
+DRIVER_MODULE(etherswitch, e6060sw, etherswitch_driver, 0, 0);
 MODULE_VERSION(e6060sw, 1);
 MODULE_DEPEND(e6060sw, miibus, 1, 1, 1); /* XXX which versions? */
 MODULE_DEPEND(e6060sw, etherswitch, 1, 1, 1); /* XXX which versions? */
diff --git a/sys/dev/etherswitch/etherswitch.c b/sys/dev/etherswitch/etherswitch.c
index 903bbc12acd3..a7bf8298d58a 100644
--- a/sys/dev/etherswitch/etherswitch.c
+++ b/sys/dev/etherswitch/etherswitch.c
@@ -56,8 +56,6 @@ static int etherswitch_attach(device_t);
 static int etherswitch_detach(device_t);
 static void etherswitch_identify(driver_t *driver, device_t parent);
 
-devclass_t etherswitch_devclass;
-
 static device_method_t etherswitch_methods[] = {
 	/* device interface */
 	DEVMETHOD(device_identify,	etherswitch_identify),
diff --git a/sys/dev/etherswitch/etherswitch.h b/sys/dev/etherswitch/etherswitch.h
index 9d87be03e26d..00a44fa6724d 100644
--- a/sys/dev/etherswitch/etherswitch.h
+++ b/sys/dev/etherswitch/etherswitch.h
@@ -9,7 +9,6 @@
 #include <net/ethernet.h>
 
 #ifdef _KERNEL
-extern devclass_t       etherswitch_devclass;
 extern driver_t         etherswitch_driver;
 #endif /* _KERNEL */
 
diff --git a/sys/dev/etherswitch/felix/felix.c b/sys/dev/etherswitch/felix/felix.c
index 82a1b474c1ff..e93cc59621fa 100644
--- a/sys/dev/etherswitch/felix/felix.c
+++ b/sys/dev/etherswitch/felix/felix.c
@@ -147,8 +147,7 @@ DEFINE_CLASS_0(felix, felix_driver, felix_methods,
 DRIVER_MODULE_ORDERED(felix, pci, felix_driver, felix_devclass,
     NULL, NULL, SI_ORDER_ANY);
 DRIVER_MODULE(miibus, felix, miibus_fdt_driver, NULL, NULL);
-DRIVER_MODULE(etherswitch, felix, etherswitch_driver, etherswitch_devclass,
-    NULL, NULL);
+DRIVER_MODULE(etherswitch, felix, etherswitch_driver, NULL, NULL);
 MODULE_VERSION(felix, 1);
 MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, felix,
     felix_pci_ids, nitems(felix_pci_ids) - 1);
diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c
index 86206ae4747e..b6fd585de57e 100644
--- a/sys/dev/etherswitch/infineon/adm6996fc.c
+++ b/sys/dev/etherswitch/infineon/adm6996fc.c
@@ -857,8 +857,7 @@ static devclass_t adm6996fc_devclass;
 DRIVER_MODULE(adm6996fc, mdio, adm6996fc_driver, adm6996fc_devclass, 0, 0);
 DRIVER_MODULE(miibus, adm6996fc, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, adm6996fc, mdio_driver, 0, 0);
-DRIVER_MODULE(etherswitch, adm6996fc, etherswitch_driver, etherswitch_devclass,
-    0, 0);
+DRIVER_MODULE(etherswitch, adm6996fc, etherswitch_driver, 0, 0);
 MODULE_VERSION(adm6996fc, 1);
 MODULE_DEPEND(adm6996fc, miibus, 1, 1, 1); /* XXX which versions? */
 MODULE_DEPEND(adm6996fc, etherswitch, 1, 1, 1); /* XXX which versions? */
diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c
index 48098fdd61b3..8adabe4dc6b8 100644
--- a/sys/dev/etherswitch/ip17x/ip17x.c
+++ b/sys/dev/etherswitch/ip17x/ip17x.c
@@ -650,7 +650,7 @@ static devclass_t ip17x_devclass;
 
 DRIVER_MODULE(ip17x, mdio, ip17x_driver, ip17x_devclass, 0, 0);
 DRIVER_MODULE(miibus, ip17x, miibus_driver, 0, 0);
-DRIVER_MODULE(etherswitch, ip17x, etherswitch_driver, etherswitch_devclass, 0, 0);
+DRIVER_MODULE(etherswitch, ip17x, etherswitch_driver, 0, 0);
 MODULE_VERSION(ip17x, 1);
 
 #ifdef FDT
diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c
index a9d2e4cf4c2f..5054c01fde2c 100644
--- a/sys/dev/etherswitch/micrel/ksz8995ma.c
+++ b/sys/dev/etherswitch/micrel/ksz8995ma.c
@@ -958,8 +958,7 @@ static devclass_t ksz8995ma_devclass;
 
 DRIVER_MODULE(ksz8995ma, spibus, ksz8995ma_driver, ksz8995ma_devclass, 0, 0);
 DRIVER_MODULE(miibus, ksz8995ma, miibus_driver, 0, 0);
-DRIVER_MODULE(etherswitch, ksz8995ma, etherswitch_driver, etherswitch_devclass,
-    0, 0);
+DRIVER_MODULE(etherswitch, ksz8995ma, etherswitch_driver, 0, 0);
 MODULE_VERSION(ksz8995ma, 1);
 MODULE_DEPEND(ksz8995ma, spibus, 1, 1, 1); /* XXX which versions? */
 MODULE_DEPEND(ksz8995ma, miibus, 1, 1, 1); /* XXX which versions? */
diff --git a/sys/dev/etherswitch/mtkswitch/mtkswitch.c b/sys/dev/etherswitch/mtkswitch/mtkswitch.c
index 53d426e32ec1..3430675406a5 100644
--- a/sys/dev/etherswitch/mtkswitch/mtkswitch.c
+++ b/sys/dev/etherswitch/mtkswitch/mtkswitch.c
@@ -668,8 +668,7 @@ static devclass_t mtkswitch_devclass;
 DRIVER_MODULE(mtkswitch, simplebus, mtkswitch_driver, mtkswitch_devclass, 0, 0);
 DRIVER_MODULE(miibus, mtkswitch, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, mtkswitch, mdio_driver, 0, 0);
-DRIVER_MODULE(etherswitch, mtkswitch, etherswitch_driver, etherswitch_devclass,
-    0, 0);
+DRIVER_MODULE(etherswitch, mtkswitch, etherswitch_driver, 0, 0);
 MODULE_VERSION(mtkswitch, 1);
 MODULE_DEPEND(mtkswitch, miibus, 1, 1, 1);
 MODULE_DEPEND(mtkswitch, etherswitch, 1, 1, 1);
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index 0a50359bd9eb..010896c03335 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -962,7 +962,7 @@ static devclass_t rtl8366rb_devclass;
 DRIVER_MODULE(rtl8366rb, iicbus, rtl8366rb_driver, rtl8366rb_devclass, 0, 0);
 DRIVER_MODULE(miibus, rtl8366rb, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, rtl8366rb, mdio_driver, 0, 0);
-DRIVER_MODULE(etherswitch, rtl8366rb, etherswitch_driver, etherswitch_devclass, 0, 0);
+DRIVER_MODULE(etherswitch, rtl8366rb, etherswitch_driver, 0, 0);
 MODULE_VERSION(rtl8366rb, 1);
 MODULE_DEPEND(rtl8366rb, iicbus, 1, 1, 1); /* XXX which versions? */
 MODULE_DEPEND(rtl8366rb, miibus, 1, 1, 1); /* XXX which versions? */
diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c
index b0d302b76e9b..683c0355f4c0 100644
--- a/sys/dev/etherswitch/ukswitch/ukswitch.c
+++ b/sys/dev/etherswitch/ukswitch/ukswitch.c
@@ -578,7 +578,7 @@ static devclass_t ukswitch_devclass;
 DRIVER_MODULE(ukswitch, mdio, ukswitch_driver, ukswitch_devclass, 0, 0);
 DRIVER_MODULE(miibus, ukswitch, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, ukswitch, mdio_driver, 0, 0);
-DRIVER_MODULE(etherswitch, ukswitch, etherswitch_driver, etherswitch_devclass, 0, 0);
+DRIVER_MODULE(etherswitch, ukswitch, etherswitch_driver, 0, 0);
 MODULE_VERSION(ukswitch, 1);
 MODULE_DEPEND(ukswitch, miibus, 1, 1, 1); /* XXX which versions? */
 MODULE_DEPEND(ukswitch, etherswitch, 1, 1, 1); /* XXX which versions? */