- Express hard dependencies on bus (pci, isa, pccard) and

  network layer (ether).
- Don't abuse module names to facilitate ifconfig module loading;
  such abuse isn't really needed.  (And if we do need type information
  associated with a module then we should make it explicit and not
  use hacks.)

26 files changed, 61 insertions, 18 deletions

diff --git a/sys/pci/agp_ali.c b/sys/pci/agp_ali.c
index fc8004c4d1b0..f89d14be7753 100644
--- a/sys/pci/agp_ali.c
+++ b/sys/pci/agp_ali.c
@@ -264,3 +264,5 @@ static driver_t agp_ali_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_ali, pci, agp_ali_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_ali, agp, 1, 1, 1);
+MODULE_DEPEND(agp_ali, pci, 1, 1, 1);
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index 7c4d0ef22801..24e3cc9a15fb 100644
--- a/sys/pci/agp_amd.c
+++ b/sys/pci/agp_amd.c
@@ -417,3 +417,5 @@ static driver_t agp_amd_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_amd, pci, agp_amd_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_amd, agp, 1, 1, 1);
+MODULE_DEPEND(agp_amd, pci, 1, 1, 1);
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 39890ac4cd64..29acc1b42460 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -701,3 +701,5 @@ static driver_t agp_i810_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_i810, pci, agp_i810_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_i810, agp, 1, 1, 1);
+MODULE_DEPEND(agp_i810, pci, 1, 1, 1);
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c
index 6441fd9aa557..c1d933a1227f 100644
--- a/sys/pci/agp_intel.c
+++ b/sys/pci/agp_intel.c
@@ -378,3 +378,5 @@ static driver_t agp_intel_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_intel, pci, agp_intel_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_intel, agp, 1, 1, 1);
+MODULE_DEPEND(agp_intel, pci, 1, 1, 1);
diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c
index 36145440c240..00cb991b126f 100644
--- a/sys/pci/agp_sis.c
+++ b/sys/pci/agp_sis.c
@@ -258,3 +258,5 @@ static driver_t agp_sis_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_sis, pci, agp_sis_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_sis, agp, 1, 1, 1);
+MODULE_DEPEND(agp_sis, pci, 1, 1, 1);
diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c
index fabebeb6dd1d..4d13230db422 100644
--- a/sys/pci/agp_via.c
+++ b/sys/pci/agp_via.c
@@ -255,3 +255,5 @@ static driver_t agp_via_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_via, pci, agp_via_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_via, agp, 1, 1, 1);
+MODULE_DEPEND(agp_via, pci, 1, 1, 1);
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index ae12197f97c8..44e0c74d7038 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -637,5 +637,6 @@ static driver_t alpm_driver = {
 };
 
 DRIVER_MODULE(alpm, pci, alpm_driver, alpm_devclass, 0, 0);
+MODULE_DEPEND(alpm, pci, 1, 1, 1);
 MODULE_DEPEND(alpm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(alpm, 1);
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index c04b57ac0083..4fc51b9c7a2b 100644
--- a/sys/pci/amdpm.c
+++ b/sys/pci/amdpm.c
@@ -676,6 +676,7 @@ static driver_t nfpm_driver = {
 DRIVER_MODULE(amdpm, pci, amdpm_driver, amdpm_devclass, 0, 0);
 DRIVER_MODULE(nfpm, pci, nfpm_driver, nfpm_devclass, 0, 0);
 
+MODULE_DEPEND(amdpm, pci, 1, 1, 1);
 MODULE_DEPEND(amdpm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(amdpm, 1);
 
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 72cb9612cf10..303f2905d676 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -88,6 +88,7 @@ static driver_t cy_pci_driver = {
 static devclass_t	cy_devclass;
 
 DRIVER_MODULE(cy, pci, cy_pci_driver, cy_devclass, 0, 0);
+MODULE_DEPEND(cy, pci, 1, 1, 1);
 
 static int
 cy_pci_probe(dev)
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 240bdba6b4ec..86fd9d595a12 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -131,6 +131,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_dcreg.h>
 
+MODULE_DEPEND(dc, pci, 1, 1, 1);
+MODULE_DEPEND(dc, ether, 1, 1, 1);
 MODULE_DEPEND(dc, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -306,8 +308,8 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW,
 	&dc_quick,0,"do not mdevget in dc driver");
 #endif
 
-DRIVER_MODULE(if_dc, cardbus, dc_driver, dc_devclass, 0, 0);
-DRIVER_MODULE(if_dc, pci, dc_driver, dc_devclass, 0, 0);
+DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
+DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
 DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
 
 #define DC_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 44de0806d195..e6d5892c6756 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -5259,4 +5259,4 @@ static driver_t tulip_pci_driver = {
     sizeof(tulip_softc_t),
 };
 static devclass_t tulip_devclass;
-DRIVER_MODULE(if_de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
+DRIVER_MODULE(de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 4b99da71cccb..68d0d651c909 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -481,5 +481,5 @@ static driver_t en_driver = {
 
 static devclass_t en_devclass;
 
-DRIVER_MODULE(if_en, pci, en_driver, en_devclass, 0, 0);
+DRIVER_MODULE(en, pci, en_driver, en_devclass, 0, 0);
 
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index a97230ab2329..3c60e0f69cc3 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -87,6 +87,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_pcnreg.h>
 
+MODULE_DEPEND(pcn, pci, 1, 1, 1);
+MODULE_DEPEND(pcn, ether, 1, 1, 1);
 MODULE_DEPEND(pcn, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -174,7 +176,7 @@ static driver_t pcn_driver = {
 
 static devclass_t pcn_devclass;
 
-DRIVER_MODULE(if_pcn, pci, pcn_driver, pcn_devclass, 0, 0);
+DRIVER_MODULE(pcn, pci, pcn_driver, pcn_devclass, 0, 0);
 DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0);
 
 #define PCN_CSR_SETBIT(sc, reg, x)			\
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 7a225988c5cf..09965971828b 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -111,6 +111,8 @@
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
+MODULE_DEPEND(rl, pci, 1, 1, 1);
+MODULE_DEPEND(rl, ether, 1, 1, 1);
 MODULE_DEPEND(rl, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -241,8 +243,8 @@ static driver_t rl_driver = {
 
 static devclass_t rl_devclass;
 
-DRIVER_MODULE(if_rl, pci, rl_driver, rl_devclass, 0, 0);
-DRIVER_MODULE(if_rl, cardbus, rl_driver, rl_devclass, 0, 0);
+DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
+DRIVER_MODULE(rl, cardbus, rl_driver, rl_devclass, 0, 0);
 DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
 
 #define EE_SET(x)					\
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 388a22abfb34..ea3cf3ec776d 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -118,6 +118,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_sfreg.h>
 
+MODULE_DEPEND(sf, pci, 1, 1, 1);
+MODULE_DEPEND(sf, ether, 1, 1, 1);
 MODULE_DEPEND(sf, miibus, 1, 1, 1);
 
 static struct sf_type sf_devs[] = {
@@ -203,7 +205,7 @@ static driver_t sf_driver = {
 
 static devclass_t sf_devclass;
 
-DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
+DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
 DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
 
 #define SF_SETBIT(sc, reg, x)	\
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 21d2c2e7f604..dfbb56079e52 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -96,6 +96,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_sisreg.h>
 
+MODULE_DEPEND(sis, pci, 1, 1, 1);
+MODULE_DEPEND(sis, ether, 1, 1, 1);
 MODULE_DEPEND(sis, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -199,7 +201,7 @@ static driver_t sis_driver = {
 
 static devclass_t sis_devclass;
 
-DRIVER_MODULE(if_sis, pci, sis_driver, sis_devclass, 0, 0);
+DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0);
 DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0);
 
 #define SIS_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 32e13ab409e5..8b15c5cd2b14 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -107,6 +107,8 @@ __FBSDID("$FreeBSD$");
 #include <pci/if_skreg.h>
 #include <pci/xmaciireg.h>
 
+MODULE_DEPEND(sk, pci, 1, 1, 1);
+MODULE_DEPEND(sk, ether, 1, 1, 1);
 MODULE_DEPEND(sk, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -236,7 +238,7 @@ static driver_t sk_driver = {
 
 static devclass_t sk_devclass;
 
-DRIVER_MODULE(if_sk, pci, skc_driver, skc_devclass, 0, 0);
+DRIVER_MODULE(sk, pci, skc_driver, skc_devclass, 0, 0);
 DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0);
 DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 4b93da01f1a7..d6e505b862f1 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_stereg.h>
 
+MODULE_DEPEND(ste, pci, 1, 1, 1);
+MODULE_DEPEND(ste, ether, 1, 1, 1);
 MODULE_DEPEND(ste, miibus, 1, 1, 1);
 
 /*
@@ -157,7 +159,7 @@ static driver_t ste_driver = {
 
 static devclass_t ste_devclass;
 
-DRIVER_MODULE(if_ste, pci, ste_driver, ste_devclass, 0, 0);
+DRIVER_MODULE(ste, pci, ste_driver, ste_devclass, 0, 0);
 DRIVER_MODULE(miibus, ste, miibus_driver, miibus_devclass, 0, 0);
 
 #define STE_SETBIT4(sc, reg, x)				\
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 2387c96926ee..c8a1c63477e7 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -279,7 +279,9 @@ static driver_t ti_driver = {
 
 static devclass_t ti_devclass;
 
-DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
+DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
+MODULE_DEPEND(ti, pci, 1, 1, 1);
+MODULE_DEPEND(ti, ether, 1, 1, 1);
 
 /* List of Tigon softcs */
 static STAILQ_HEAD(ti_softc_list, ti_softc) ti_sc_list;
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 25b19f88d917..c546ad95d1d9 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -219,6 +219,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_tlreg.h>
 
+MODULE_DEPEND(tl, pci, 1, 1, 1);
+MODULE_DEPEND(tl, ether, 1, 1, 1);
 MODULE_DEPEND(tl, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -352,7 +354,7 @@ static driver_t tl_driver = {
 
 static devclass_t tl_devclass;
 
-DRIVER_MODULE(if_tl, pci, tl_driver, tl_devclass, 0, 0);
+DRIVER_MODULE(tl, pci, tl_driver, tl_devclass, 0, 0);
 DRIVER_MODULE(miibus, tl, miibus_driver, miibus_devclass, 0, 0);
 
 static u_int8_t tl_dio_read8(sc, reg)
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index ad0ed09c07d2..f5dc39daf23e 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -95,6 +95,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_vrreg.h>
 
+MODULE_DEPEND(vr, pci, 1, 1, 1);
+MODULE_DEPEND(vr, ether, 1, 1, 1);
 MODULE_DEPEND(vr, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -200,7 +202,7 @@ static driver_t vr_driver = {
 
 static devclass_t vr_devclass;
 
-DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
+DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
 DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
 
 #define VR_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index fe5ec34edc47..61c26742988d 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -125,6 +125,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_wbreg.h>
 
+MODULE_DEPEND(wb, pci, 1, 1, 1);
+MODULE_DEPEND(wb, ether, 1, 1, 1);
 MODULE_DEPEND(wb, miibus, 1, 1, 1);
 
 /*
@@ -218,7 +220,7 @@ static driver_t wb_driver = {
 
 static devclass_t wb_devclass;
 
-DRIVER_MODULE(if_wb, pci, wb_driver, wb_devclass, 0, 0);
+DRIVER_MODULE(wb, pci, wb_driver, wb_devclass, 0, 0);
 DRIVER_MODULE(miibus, wb, miibus_driver, miibus_devclass, 0, 0);
 
 #define WB_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 344e75c7dc92..88797d4a21e4 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -132,6 +132,8 @@ __FBSDID("$FreeBSD$");
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
+MODULE_DEPEND(xl, pci, 1, 1, 1);
+MODULE_DEPEND(xl, ether, 1, 1, 1);
 MODULE_DEPEND(xl, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -292,8 +294,8 @@ static driver_t xl_driver = {
 
 static devclass_t xl_devclass;
 
-DRIVER_MODULE(if_xl, cardbus, xl_driver, xl_devclass, 0, 0);
-DRIVER_MODULE(if_xl, pci, xl_driver, xl_devclass, 0, 0);
+DRIVER_MODULE(xl, cardbus, xl_driver, xl_devclass, 0, 0);
+DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
 DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
 
 static void
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index bd7b5c318cd3..e331d4f24101 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -7157,7 +7157,8 @@ static driver_t ncr_driver = {
 
 static devclass_t ncr_devclass;
 
-DRIVER_MODULE(if_ncr, pci, ncr_driver, ncr_devclass, 0, 0);
+DRIVER_MODULE(ncr, pci, ncr_driver, ncr_devclass, 0, 0);
+MODULE_DEPEND(ncr, pci, 1, 1, 1);
 
 /*=========================================================================*/
 #endif /* _KERNEL */
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index faee3cdbec27..6f02a6d0c976 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -919,6 +919,8 @@ static driver_t viapropm_driver = {
 DRIVER_MODULE(viapm, pci, viapm_driver, viapm_devclass, 0, 0);
 DRIVER_MODULE(viapropm, pci, viapropm_driver, viapropm_devclass, 0, 0);
 
+MODULE_DEPEND(viapm, pci, 1, 1, 1);
+MODULE_DEPEND(viaprom, pci, 1, 1, 1);
 MODULE_DEPEND(viapm, iicbb, IICBB_MINVER, IICBB_PREFVER, IICBB_MAXVER);
 MODULE_DEPEND(viapropm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(viapm, 1);
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index eca1a118a0a5..6e0ee05a49f9 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -263,3 +263,4 @@ static driver_t xrpu_driver = {
  
  
 DRIVER_MODULE(xrpu, pci, xrpu_driver, xrpu_devclass, 0, 0);
+MODULE_DEPEND(xrpu, pci, 1, 1, 1);