Tweak these for what I hope is the last time: change the DRIVER_MODULE()

declaration for the interface driver from "foo" to "if_foo" but leave the
declaration for the miibus attached to the interface driver alone. This
lets the internal module name be "if_foo" while still allowing the miibus
instances to attach to "foo."

This should allow ifconfig to autoload driver modules again without
breaking the miibus attach.

21 files changed, 21 insertions, 21 deletions

diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 84cabd2..d2438e3 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -701,7 +701,7 @@ static driver_t fxp_driver = {
 
 static devclass_t fxp_devclass;
 
-DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
+DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0);
 
 #endif /* __NetBSD__ */
 
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 35d6f29..5f02606 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -208,7 +208,7 @@ static driver_t sf_driver = {
 
 static devclass_t sf_devclass;
 
-DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
+DRIVER_MODULE(if_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/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index d80e4ab..fdea86f 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -181,7 +181,7 @@ static driver_t sk_driver = {
 
 static devclass_t sk_devclass;
 
-DRIVER_MODULE(skc, pci, sk_driver, sk_devclass, 0, 0);
+DRIVER_MODULE(if_sk, pci, sk_driver, sk_devclass, 0, 0);
 
 #define SK_SETBIT(sc, reg, x)		\
 	CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x)
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 7fefb8e..947f6c1 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -224,7 +224,7 @@ static driver_t ti_driver = {
 
 static devclass_t ti_devclass;
 
-DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
+DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
 
 /*
  * Send an instruction or address to the EEPROM, check for ACK.
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 7ed0d86..af3ae7e 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -202,7 +202,7 @@ static driver_t vr_driver = {
 
 static devclass_t vr_devclass;
 
-DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
+DRIVER_MODULE(if_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_al.c b/sys/pci/if_al.c
index 073cd66..a430e21 100644
--- a/sys/pci/if_al.c
+++ b/sys/pci/if_al.c
@@ -201,7 +201,7 @@ static driver_t al_driver = {
 
 static devclass_t al_devclass;
 
-DRIVER_MODULE(al, pci, al_driver, al_devclass, 0, 0);
+DRIVER_MODULE(if_al, pci, al_driver, al_devclass, 0, 0);
 DRIVER_MODULE(miibus, al, miibus_driver, miibus_devclass, 0, 0);
 
 #define AL_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index da6637f..0cb2daf 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.c
@@ -197,7 +197,7 @@ static driver_t ax_driver = {
 
 static devclass_t ax_devclass;
 
-DRIVER_MODULE(ax, pci, ax_driver, ax_devclass, 0, 0);
+DRIVER_MODULE(if_ax, pci, ax_driver, ax_devclass, 0, 0);
 
 #define AX_SETBIT(sc, reg, x)				\
 	CSR_WRITE_4(sc, reg,				\
diff --git a/sys/pci/if_dm.c b/sys/pci/if_dm.c
index 38cc134..1bbcae6 100644
--- a/sys/pci/if_dm.c
+++ b/sys/pci/if_dm.c
@@ -190,7 +190,7 @@ static driver_t dm_driver = {
 
 static devclass_t dm_devclass;
 
-DRIVER_MODULE(dm, pci, dm_driver, dm_devclass, 0, 0);
+DRIVER_MODULE(if_dm, pci, dm_driver, dm_devclass, 0, 0);
 DRIVER_MODULE(miibus, dm, miibus_driver, miibus_devclass, 0, 0);
 
 #define DM_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 84cabd2..d2438e3 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -701,7 +701,7 @@ static driver_t fxp_driver = {
 
 static devclass_t fxp_devclass;
 
-DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
+DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0);
 
 #endif /* __NetBSD__ */
 
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index a6fbdb4..739ff3b 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -215,7 +215,7 @@ static driver_t mx_driver = {
 
 static devclass_t mx_devclass;
 
-DRIVER_MODULE(mx, pci, mx_driver, mx_devclass, 0, 0);
+DRIVER_MODULE(if_mx, pci, mx_driver, mx_devclass, 0, 0);
 
 #define MX_SETBIT(sc, reg, x)				\
 	CSR_WRITE_4(sc, reg,				\
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 63b9141..8483cc9 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -207,7 +207,7 @@ static driver_t pn_driver = {
 
 static devclass_t pn_devclass;
 
-DRIVER_MODULE(pn, pci, pn_driver, pn_devclass, 0, 0);
+DRIVER_MODULE(if_pn, pci, pn_driver, pn_devclass, 0, 0);
 
 #define PN_SETBIT(sc, reg, x)				\
 	CSR_WRITE_4(sc, reg,				\
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index d7a2248..6b48b49 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -228,7 +228,7 @@ static driver_t rl_driver = {
 
 static devclass_t rl_devclass;
 
-DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
+DRIVER_MODULE(if_rl, pci, 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 35d6f29..5f02606 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -208,7 +208,7 @@ static driver_t sf_driver = {
 
 static devclass_t sf_devclass;
 
-DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
+DRIVER_MODULE(if_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 1f92f08..fe3f50c 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -185,7 +185,7 @@ static driver_t sis_driver = {
 
 static devclass_t sis_devclass;
 
-DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0);
+DRIVER_MODULE(if_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 d80e4ab..fdea86f 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -181,7 +181,7 @@ static driver_t sk_driver = {
 
 static devclass_t sk_devclass;
 
-DRIVER_MODULE(skc, pci, sk_driver, sk_devclass, 0, 0);
+DRIVER_MODULE(if_sk, pci, sk_driver, sk_devclass, 0, 0);
 
 #define SK_SETBIT(sc, reg, x)		\
 	CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x)
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 2248725..aea212e 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -172,7 +172,7 @@ static driver_t ste_driver = {
 
 static devclass_t ste_devclass;
 
-DRIVER_MODULE(ste, pci, ste_driver, ste_devclass, 0, 0);
+DRIVER_MODULE(if_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 7fefb8e..947f6c1 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -224,7 +224,7 @@ static driver_t ti_driver = {
 
 static devclass_t ti_devclass;
 
-DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
+DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
 
 /*
  * Send an instruction or address to the EEPROM, check for ACK.
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index ed43a81..48df6f5 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -361,7 +361,7 @@ static driver_t tl_driver = {
 
 static devclass_t tl_devclass;
 
-DRIVER_MODULE(tl, pci, tl_driver, tl_devclass, 0, 0);
+DRIVER_MODULE(if_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 7ed0d86..af3ae7e 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -202,7 +202,7 @@ static driver_t vr_driver = {
 
 static devclass_t vr_devclass;
 
-DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
+DRIVER_MODULE(if_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 f05c191..5e8f68d 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -229,7 +229,7 @@ static driver_t wb_driver = {
 
 static devclass_t wb_devclass;
 
-DRIVER_MODULE(wb, pci, wb_driver, wb_devclass, 0, 0);
+DRIVER_MODULE(if_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 9f667c7..dc45073 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -285,7 +285,7 @@ static driver_t xl_driver = {
 
 static devclass_t xl_devclass;
 
-DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
+DRIVER_MODULE(if_xl, pci, xl_driver, xl_devclass, 0, 0);
 DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
 
 /*