Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 May 2022 21:47:35 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 42726c2fc23a - main - etherswitch drivers: Remove unused devclass arguments to DRIVER_MODULE.
Message-ID:  <202205092147.249LlZPE079846@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=42726c2fc23a463a1c43cab1bf9cca158c81a0f3

commit 42726c2fc23a463a1c43cab1bf9cca158c81a0f3
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-09 21:26:44 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-09 21:26:44 +0000

    etherswitch drivers: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/dev/etherswitch/ar40xx/ar40xx_main.c  | 5 ++---
 sys/dev/etherswitch/arswitch/arswitch.c   | 3 +--
 sys/dev/etherswitch/e6000sw/e6000sw.c     | 4 +---
 sys/dev/etherswitch/e6000sw/e6060sw.c     | 3 +--
 sys/dev/etherswitch/felix/felix.c         | 4 +---
 sys/dev/etherswitch/infineon/adm6996fc.c  | 3 +--
 sys/dev/etherswitch/ip17x/ip17x.c         | 3 +--
 sys/dev/etherswitch/micrel/ksz8995ma.c    | 3 +--
 sys/dev/etherswitch/miiproxy.c            | 4 +---
 sys/dev/etherswitch/mtkswitch/mtkswitch.c | 3 +--
 sys/dev/etherswitch/rtl8366/rtl8366rb.c   | 3 +--
 sys/dev/etherswitch/ukswitch/ukswitch.c   | 3 +--
 12 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_main.c b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
index ec31d5cd9d5d..0d5fbf65fa79 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_main.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
@@ -955,10 +955,9 @@ static device_method_t ar40xx_methods[] = {
 
 DEFINE_CLASS_0(ar40xx, ar40xx_driver, ar40xx_methods,
     sizeof(struct ar40xx_softc));
-static devclass_t ar40xx_devclass;
 
-DRIVER_MODULE(ar40xx, simplebus, ar40xx_driver, ar40xx_devclass, 0, 0);
-DRIVER_MODULE(ar40xx, ofwbus, ar40xx_driver, ar40xx_devclass, 0, 0);
+DRIVER_MODULE(ar40xx, simplebus, ar40xx_driver, 0, 0);
+DRIVER_MODULE(ar40xx, ofwbus, ar40xx_driver, 0, 0);
 DRIVER_MODULE(miibus, ar40xx, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, ar40xx, mdio_driver, 0, 0);
 DRIVER_MODULE(etherswitch, ar40xx, etherswitch_driver, 0, 0);
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index eb4c9630e099..04d1d9143075 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -1344,9 +1344,8 @@ static device_method_t arswitch_methods[] = {
 
 DEFINE_CLASS_0(arswitch, arswitch_driver, arswitch_methods,
     sizeof(struct arswitch_softc));
-static devclass_t arswitch_devclass;
 
-DRIVER_MODULE(arswitch, mdio, arswitch_driver, arswitch_devclass, 0, 0);
+DRIVER_MODULE(arswitch, mdio, arswitch_driver, 0, 0);
 DRIVER_MODULE(miibus, arswitch, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, arswitch, mdio_driver, 0, 0);
 DRIVER_MODULE(etherswitch, arswitch, etherswitch_driver, 0, 0);
diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c
index bd7575b21443..3c0ede5cddcd 100644
--- a/sys/dev/etherswitch/e6000sw/e6000sw.c
+++ b/sys/dev/etherswitch/e6000sw/e6000sw.c
@@ -180,12 +180,10 @@ static device_method_t e6000sw_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t e6000sw_devclass;
-
 DEFINE_CLASS_0(e6000sw, e6000sw_driver, e6000sw_methods,
     sizeof(e6000sw_softc_t));
 
-DRIVER_MODULE(e6000sw, mdio, e6000sw_driver, e6000sw_devclass, 0, 0);
+DRIVER_MODULE(e6000sw, mdio, e6000sw_driver, 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 b1af8151c978..a61de3d2b418 100644
--- a/sys/dev/etherswitch/e6000sw/e6060sw.c
+++ b/sys/dev/etherswitch/e6000sw/e6060sw.c
@@ -1022,9 +1022,8 @@ static device_method_t e6060sw_methods[] = {
 
 DEFINE_CLASS_0(e6060sw, e6060sw_driver, e6060sw_methods,
     sizeof(struct e6060sw_softc));
-static devclass_t e6060sw_devclass;
 
-DRIVER_MODULE(e6060sw, mdio, e6060sw_driver, e6060sw_devclass, 0, 0);
+DRIVER_MODULE(e6060sw, mdio, e6060sw_driver, 0, 0);
 DRIVER_MODULE(miibus, e6060sw, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, e6060sw, mdio_driver, 0, 0);
 DRIVER_MODULE(etherswitch, e6060sw, etherswitch_driver, 0, 0);
diff --git a/sys/dev/etherswitch/felix/felix.c b/sys/dev/etherswitch/felix/felix.c
index e93cc59621fa..e184e2a0fc16 100644
--- a/sys/dev/etherswitch/felix/felix.c
+++ b/sys/dev/etherswitch/felix/felix.c
@@ -140,12 +140,10 @@ static device_method_t felix_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t felix_devclass;
 DEFINE_CLASS_0(felix, felix_driver, felix_methods,
     sizeof(struct felix_softc));
 
-DRIVER_MODULE_ORDERED(felix, pci, felix_driver, felix_devclass,
-    NULL, NULL, SI_ORDER_ANY);
+DRIVER_MODULE_ORDERED(felix, pci, felix_driver, NULL, NULL, SI_ORDER_ANY);
 DRIVER_MODULE(miibus, felix, miibus_fdt_driver, NULL, NULL);
 DRIVER_MODULE(etherswitch, felix, etherswitch_driver, NULL, NULL);
 MODULE_VERSION(felix, 1);
diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c
index b6fd585de57e..0199b53736b3 100644
--- a/sys/dev/etherswitch/infineon/adm6996fc.c
+++ b/sys/dev/etherswitch/infineon/adm6996fc.c
@@ -852,9 +852,8 @@ static device_method_t adm6996fc_methods[] = {
 
 DEFINE_CLASS_0(adm6996fc, adm6996fc_driver, adm6996fc_methods,
     sizeof(struct adm6996fc_softc));
-static devclass_t adm6996fc_devclass;
 
-DRIVER_MODULE(adm6996fc, mdio, adm6996fc_driver, adm6996fc_devclass, 0, 0);
+DRIVER_MODULE(adm6996fc, mdio, adm6996fc_driver, 0, 0);
 DRIVER_MODULE(miibus, adm6996fc, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, adm6996fc, mdio_driver, 0, 0);
 DRIVER_MODULE(etherswitch, adm6996fc, etherswitch_driver, 0, 0);
diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c
index 8adabe4dc6b8..d900eef9bd37 100644
--- a/sys/dev/etherswitch/ip17x/ip17x.c
+++ b/sys/dev/etherswitch/ip17x/ip17x.c
@@ -646,9 +646,8 @@ static device_method_t ip17x_methods[] = {
 
 DEFINE_CLASS_0(ip17x, ip17x_driver, ip17x_methods,
     sizeof(struct ip17x_softc));
-static devclass_t ip17x_devclass;
 
-DRIVER_MODULE(ip17x, mdio, ip17x_driver, ip17x_devclass, 0, 0);
+DRIVER_MODULE(ip17x, mdio, ip17x_driver, 0, 0);
 DRIVER_MODULE(miibus, ip17x, miibus_driver, 0, 0);
 DRIVER_MODULE(etherswitch, ip17x, etherswitch_driver, 0, 0);
 MODULE_VERSION(ip17x, 1);
diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c
index 5054c01fde2c..386bd9ebd436 100644
--- a/sys/dev/etherswitch/micrel/ksz8995ma.c
+++ b/sys/dev/etherswitch/micrel/ksz8995ma.c
@@ -954,9 +954,8 @@ static device_method_t ksz8995ma_methods[] = {
 
 DEFINE_CLASS_0(ksz8995ma, ksz8995ma_driver, ksz8995ma_methods,
     sizeof(struct ksz8995ma_softc));
-static devclass_t ksz8995ma_devclass;
 
-DRIVER_MODULE(ksz8995ma, spibus, ksz8995ma_driver, ksz8995ma_devclass, 0, 0);
+DRIVER_MODULE(ksz8995ma, spibus, ksz8995ma_driver, 0, 0);
 DRIVER_MODULE(miibus, ksz8995ma, miibus_driver, 0, 0);
 DRIVER_MODULE(etherswitch, ksz8995ma, etherswitch_driver, 0, 0);
 MODULE_VERSION(ksz8995ma, 1);
diff --git a/sys/dev/etherswitch/miiproxy.c b/sys/dev/etherswitch/miiproxy.c
index ccebcde12266..58e8d7899fc8 100644
--- a/sys/dev/etherswitch/miiproxy.c
+++ b/sys/dev/etherswitch/miiproxy.c
@@ -432,9 +432,7 @@ DEFINE_CLASS_0(miiproxy, miiproxy_driver, miiproxy_methods,
 DEFINE_CLASS_0(mdioproxy, mdioproxy_driver, mdioproxy_methods,
     sizeof(struct mdioproxy_softc));
 
-static devclass_t mdioproxy_devclass;
-
-DRIVER_MODULE(mdioproxy, mdio, mdioproxy_driver, mdioproxy_devclass, 0, 0);
+DRIVER_MODULE(mdioproxy, mdio, mdioproxy_driver, 0, 0);
 DRIVER_MODULE(miibus, miiproxy, miibus_driver, 0, 0);
 MODULE_VERSION(miiproxy, 1);
 MODULE_DEPEND(miiproxy, miibus, 1, 1, 1);
diff --git a/sys/dev/etherswitch/mtkswitch/mtkswitch.c b/sys/dev/etherswitch/mtkswitch/mtkswitch.c
index 3430675406a5..fc496ba63ce5 100644
--- a/sys/dev/etherswitch/mtkswitch/mtkswitch.c
+++ b/sys/dev/etherswitch/mtkswitch/mtkswitch.c
@@ -663,9 +663,8 @@ static device_method_t mtkswitch_methods[] = {
 
 DEFINE_CLASS_0(mtkswitch, mtkswitch_driver, mtkswitch_methods,
     sizeof(struct mtkswitch_softc));
-static devclass_t mtkswitch_devclass;
 
-DRIVER_MODULE(mtkswitch, simplebus, mtkswitch_driver, mtkswitch_devclass, 0, 0);
+DRIVER_MODULE(mtkswitch, simplebus, mtkswitch_driver, 0, 0);
 DRIVER_MODULE(miibus, mtkswitch, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, mtkswitch, mdio_driver, 0, 0);
 DRIVER_MODULE(etherswitch, mtkswitch, etherswitch_driver, 0, 0);
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index 010896c03335..2ea34f4292a3 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -957,9 +957,8 @@ static device_method_t rtl8366rb_methods[] = {
 
 DEFINE_CLASS_0(rtl8366rb, rtl8366rb_driver, rtl8366rb_methods,
     sizeof(struct rtl8366rb_softc));
-static devclass_t rtl8366rb_devclass;
 
-DRIVER_MODULE(rtl8366rb, iicbus, rtl8366rb_driver, rtl8366rb_devclass, 0, 0);
+DRIVER_MODULE(rtl8366rb, iicbus, rtl8366rb_driver, 0, 0);
 DRIVER_MODULE(miibus, rtl8366rb, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, rtl8366rb, mdio_driver, 0, 0);
 DRIVER_MODULE(etherswitch, rtl8366rb, etherswitch_driver, 0, 0);
diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c
index 683c0355f4c0..ee9415e0584b 100644
--- a/sys/dev/etherswitch/ukswitch/ukswitch.c
+++ b/sys/dev/etherswitch/ukswitch/ukswitch.c
@@ -573,9 +573,8 @@ static device_method_t ukswitch_methods[] = {
 
 DEFINE_CLASS_0(ukswitch, ukswitch_driver, ukswitch_methods,
     sizeof(struct ukswitch_softc));
-static devclass_t ukswitch_devclass;
 
-DRIVER_MODULE(ukswitch, mdio, ukswitch_driver, ukswitch_devclass, 0, 0);
+DRIVER_MODULE(ukswitch, mdio, ukswitch_driver, 0, 0);
 DRIVER_MODULE(miibus, ukswitch, miibus_driver, 0, 0);
 DRIVER_MODULE(mdio, ukswitch, mdio_driver, 0, 0);
 DRIVER_MODULE(etherswitch, ukswitch, etherswitch_driver, 0, 0);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205092147.249LlZPE079846>