From df49d6c9348d4b595dd76333bb06404c57f582b7 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 25 Jun 2024 17:40:09 -0400 Subject: [PATCH] drivers/network: Remove remaining declarations of "devclass". Mainly the ported OpenBSD drivers (where this was added in Haiku-specific code), and then the few remaining drivers that are no longer supported on FreeBSD. --- .../kernel/drivers/network/ether/dec21xxx/dev/de/if_de.c | 4 +--- .../kernel/drivers/network/ether/pcnet/dev/pcn/if_pcn.c | 6 ++---- .../kernel/drivers/network/ether/rtl8125/dev/pci/if_rge.c | 4 +--- .../kernel/drivers/network/ether/sis900/dev/sis/if_sis.c | 6 ++---- .../drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c | 4 +--- .../drivers/network/wlan/atheroswifi/dev/ath/if_ath_pci.c | 3 +-- .../kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c | 4 +--- .../drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c | 4 +--- 8 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_de.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_de.c index ea2007098c..0116ad7f19 100644 --- a/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_de.c +++ b/src/add-ons/kernel/drivers/network/ether/dec21xxx/dev/de/if_de.c @@ -4909,9 +4909,7 @@ static driver_t tulip_pci_driver = { sizeof(tulip_softc_t), }; -static devclass_t tulip_devclass; - -DRIVER_MODULE(de, pci, tulip_pci_driver, tulip_devclass, 0, 0); +DRIVER_MODULE(de, pci, tulip_pci_driver, 0, 0); #ifdef DDB void tulip_dumpring(int unit, int ring); diff --git a/src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcn.c b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcn.c index 378deb2c88..240b793db3 100644 --- a/src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcn.c +++ b/src/add-ons/kernel/drivers/network/ether/pcnet/dev/pcn/if_pcn.c @@ -190,12 +190,10 @@ static driver_t pcn_driver = { sizeof(struct pcn_softc) }; -static devclass_t pcn_devclass; - -DRIVER_MODULE(pcn, pci, pcn_driver, pcn_devclass, 0, 0); +DRIVER_MODULE(pcn, pci, pcn_driver, 0, 0); MODULE_PNP_INFO("U16:vendor;U16:device", pci, pcn, pcn_devs, nitems(pcn_devs) - 1); -DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0); +DRIVER_MODULE(miibus, pcn, miibus_driver, 0, 0); #define PCN_CSR_SETBIT(sc, reg, x) \ pcn_csr_write(sc, reg, pcn_csr_read(sc, reg) | (x)) diff --git a/src/add-ons/kernel/drivers/network/ether/rtl8125/dev/pci/if_rge.c b/src/add-ons/kernel/drivers/network/ether/rtl8125/dev/pci/if_rge.c index 6345beb3e4..291c8399d0 100644 --- a/src/add-ons/kernel/drivers/network/ether/rtl8125/dev/pci/if_rge.c +++ b/src/add-ons/kernel/drivers/network/ether/rtl8125/dev/pci/if_rge.c @@ -414,9 +414,7 @@ static driver_t rge_pci_driver = { sizeof (struct rge_softc) }; -static devclass_t rge_devclass; - -DRIVER_MODULE(rge, pci, rge_pci_driver, rge_devclass, NULL, NULL); +DRIVER_MODULE(rge, pci, rge_pci_driver, NULL, NULL); #else int rge_activate(struct device *self, int act) diff --git a/src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sis.c b/src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sis.c index 8d63427471..a214c266fd 100644 --- a/src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sis.c +++ b/src/add-ons/kernel/drivers/network/ether/sis900/dev/sis/if_sis.c @@ -2406,7 +2406,5 @@ static driver_t sis_driver = { sizeof(struct sis_softc) }; -static devclass_t sis_devclass; - -DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0); -DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0); +DRIVER_MODULE(sis, pci, sis_driver, 0, 0); +DRIVER_MODULE(miibus, sis, miibus_driver, 0, 0); diff --git a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c index 41c72a22fd..2d58a587c7 100644 --- a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c +++ b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c @@ -270,9 +270,7 @@ static driver_t an_pci_driver = { sizeof(struct an_softc), }; -static devclass_t an_devclass; - -DRIVER_MODULE(an, pci, an_pci_driver, an_devclass, 0, 0); +DRIVER_MODULE(an, pci, an_pci_driver, 0, 0); MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, an, an_devs, nitems(an_devs) - 1); MODULE_DEPEND(an, pci, 1, 1, 1); diff --git a/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath_pci.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath_pci.c index 490a9298a9..9ef4e5a729 100644 --- a/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath_pci.c +++ b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath_pci.c @@ -464,8 +464,7 @@ static driver_t ath_pci_driver = { ath_pci_methods, sizeof (struct ath_pci_softc) }; -static devclass_t ath_devclass; -DRIVER_MODULE(if_ath_pci, pci, ath_pci_driver, ath_devclass, 0, 0); +DRIVER_MODULE(if_ath_pci, pci, ath_pci_driver, 0, 0); MODULE_VERSION(if_ath_pci, 1); MODULE_DEPEND(if_ath_pci, wlan, 1, 1, 1); /* 802.11 media layer */ MODULE_DEPEND(if_ath_pci, ath_main, 1, 1, 1); /* if_ath driver */ diff --git a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c index 9a826cef6a..ad98b71189 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c +++ b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c @@ -11571,9 +11571,7 @@ static driver_t iwx_pci_driver = { sizeof (struct iwx_softc) }; -static devclass_t iwx_devclass; - -DRIVER_MODULE(iwx, pci, iwx_pci_driver, iwx_devclass, NULL, NULL); +DRIVER_MODULE(iwx, pci, iwx_pci_driver, NULL, NULL); #else int iwx_activate(struct device *self, int act) diff --git a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c index 61ffeb7736..1a12d50e92 100644 --- a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c +++ b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c @@ -12277,9 +12277,7 @@ static driver_t iwm_pci_driver = { sizeof (struct iwm_softc) }; -static devclass_t iwm_devclass; - -DRIVER_MODULE(iwm, pci, iwm_pci_driver, iwm_devclass, NULL, NULL); +DRIVER_MODULE(iwm, pci, iwm_pci_driver, NULL, NULL); #else int iwm_activate(struct device *self, int act)