usb: Remove unused devclass arguments to DRIVER_MODULE.

18 files changed, 18 insertions, 52 deletions

diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index 542bcad44749..3e4251cf1562 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -278,9 +278,7 @@ static driver_t aue_driver = {
 	.size = sizeof(struct aue_softc)
 };
 
-static devclass_t aue_devclass;
-
-DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, NULL, 0);
+DRIVER_MODULE(aue, uhub, aue_driver, NULL, NULL);
 DRIVER_MODULE(miibus, aue, miibus_driver, 0, 0);
 MODULE_DEPEND(aue, uether, 1, 1, 1);
 MODULE_DEPEND(aue, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index 3eb2fec2d448..cd4e27b99a56 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -274,9 +274,7 @@ static driver_t axe_driver = {
 	.size = sizeof(struct axe_softc),
 };
 
-static devclass_t axe_devclass;
-
-DRIVER_MODULE(axe, uhub, axe_driver, axe_devclass, NULL, 0);
+DRIVER_MODULE(axe, uhub, axe_driver, NULL, NULL);
 DRIVER_MODULE(miibus, axe, miibus_driver, 0, 0);
 MODULE_DEPEND(axe, uether, 1, 1, 1);
 MODULE_DEPEND(axe, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index 219326b66ba4..ae0e7c553f79 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -191,9 +191,7 @@ static driver_t axge_driver = {
 	.size = sizeof(struct axge_softc),
 };
 
-static devclass_t axge_devclass;
-
-DRIVER_MODULE(axge, uhub, axge_driver, axge_devclass, NULL, NULL);
+DRIVER_MODULE(axge, uhub, axge_driver, NULL, NULL);
 DRIVER_MODULE(miibus, axge, miibus_driver, NULL, NULL);
 MODULE_DEPEND(axge, uether, 1, 1, 1);
 MODULE_DEPEND(axge, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index b5fa4944974c..551ba5d7fefa 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -259,7 +259,6 @@ static driver_t cdce_driver = {
 	.size = sizeof(struct cdce_softc),
 };
 
-static devclass_t cdce_devclass;
 static eventhandler_tag cdce_etag;
 
 static int  cdce_driver_loaded(struct module *, int, void *);
@@ -303,7 +302,7 @@ static const STRUCT_USB_DUAL_ID cdce_dual_devs[] = {
 	{USB_IF_CSI(UICLASS_CDC, UISUBCLASS_NETWORK_CONTROL_MODEL, 0)},
 };
 
-DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, cdce_driver_loaded, 0);
+DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_driver_loaded, NULL);
 MODULE_VERSION(cdce, 1);
 MODULE_DEPEND(cdce, uether, 1, 1, 1);
 MODULE_DEPEND(cdce, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_cdceem.c b/sys/dev/usb/net/if_cdceem.c
index 7c56a3482402..c539a78792e5 100644
--- a/sys/dev/usb/net/if_cdceem.c
+++ b/sys/dev/usb/net/if_cdceem.c
@@ -210,15 +210,13 @@ static driver_t cdceem_driver = {
 	.size = sizeof(struct cdceem_softc),
 };
 
-static devclass_t cdceem_devclass;
-
 static const STRUCT_USB_DUAL_ID cdceem_dual_devs[] = {
 	{USB_IFACE_CLASS(UICLASS_CDC),
 		USB_IFACE_SUBCLASS(UISUBCLASS_ETHERNET_EMULATION_MODEL),
 		0},
 };
 
-DRIVER_MODULE(cdceem, uhub, cdceem_driver, cdceem_devclass, NULL, NULL);
+DRIVER_MODULE(cdceem, uhub, cdceem_driver, NULL, NULL);
 MODULE_VERSION(cdceem, 1);
 MODULE_DEPEND(cdceem, uether, 1, 1, 1);
 MODULE_DEPEND(cdceem, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index 2a1e4b88c19a..a5c0a988e1cf 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -172,9 +172,7 @@ static driver_t cue_driver = {
 	.size = sizeof(struct cue_softc),
 };
 
-static devclass_t cue_devclass;
-
-DRIVER_MODULE(cue, uhub, cue_driver, cue_devclass, NULL, 0);
+DRIVER_MODULE(cue, uhub, cue_driver, NULL, NULL);
 MODULE_DEPEND(cue, uether, 1, 1, 1);
 MODULE_DEPEND(cue, usb, 1, 1, 1);
 MODULE_DEPEND(cue, ether, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c
index f43c39154662..7bb881b80e51 100644
--- a/sys/dev/usb/net/if_ipheth.c
+++ b/sys/dev/usb/net/if_ipheth.c
@@ -131,8 +131,6 @@ static driver_t ipheth_driver = {
 	.size = sizeof(struct ipheth_softc),
 };
 
-static devclass_t ipheth_devclass;
-
 static const STRUCT_USB_HOST_ID ipheth_devs[] = {
 #if 0
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
@@ -162,7 +160,7 @@ static const STRUCT_USB_HOST_ID ipheth_devs[] = {
 #endif
 };
 
-DRIVER_MODULE(ipheth, uhub, ipheth_driver, ipheth_devclass, NULL, 0);
+DRIVER_MODULE(ipheth, uhub, ipheth_driver, NULL, NULL);
 MODULE_VERSION(ipheth, 1);
 MODULE_DEPEND(ipheth, uether, 1, 1, 1);
 MODULE_DEPEND(ipheth, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index 21719e486d14..5b4f9b1fe4c4 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -214,9 +214,7 @@ static driver_t kue_driver = {
 	.size = sizeof(struct kue_softc),
 };
 
-static devclass_t kue_devclass;
-
-DRIVER_MODULE(kue, uhub, kue_driver, kue_devclass, NULL, 0);
+DRIVER_MODULE(kue, uhub, kue_driver, NULL, NULL);
 MODULE_DEPEND(kue, uether, 1, 1, 1);
 MODULE_DEPEND(kue, usb, 1, 1, 1);
 MODULE_DEPEND(kue, ether, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index 14f1be4157b3..f8c1a9a9b4e2 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -245,9 +245,7 @@ static driver_t mos_driver = {
 	.size = sizeof(struct mos_softc)
 };
 
-static devclass_t mos_devclass;
-
-DRIVER_MODULE(mos, uhub, mos_driver, mos_devclass, NULL, 0);
+DRIVER_MODULE(mos, uhub, mos_driver, NULL, NULL);
 DRIVER_MODULE(miibus, mos, miibus_driver, 0, 0);
 MODULE_DEPEND(mos, uether, 1, 1, 1);
 MODULE_DEPEND(mos, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c
index 006dcf29b1b9..88897dac8f50 100644
--- a/sys/dev/usb/net/if_muge.c
+++ b/sys/dev/usb/net/if_muge.c
@@ -2264,9 +2264,7 @@ static driver_t muge_driver = {
 	.size = sizeof(struct muge_softc),
 };
 
-static devclass_t muge_devclass;
-
-DRIVER_MODULE(muge, uhub, muge_driver, muge_devclass, NULL, NULL);
+DRIVER_MODULE(muge, uhub, muge_driver, NULL, NULL);
 DRIVER_MODULE(miibus, muge, miibus_driver, NULL, NULL);
 MODULE_DEPEND(muge, uether, 1, 1, 1);
 MODULE_DEPEND(muge, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 59b91c89ed70..3bdef334fa38 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -212,10 +212,7 @@ static driver_t rue_driver = {
 	.size = sizeof(struct rue_softc),
 };
 
-static devclass_t rue_devclass;
-
-DRIVER_MODULE_ORDERED(rue, uhub, rue_driver, rue_devclass, NULL, NULL,
-    SI_ORDER_ANY);
+DRIVER_MODULE_ORDERED(rue, uhub, rue_driver, NULL, NULL, SI_ORDER_ANY);
 DRIVER_MODULE(miibus, rue, miibus_driver, NULL, NULL);
 MODULE_DEPEND(rue, uether, 1, 1, 1);
 MODULE_DEPEND(rue, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index c1a081511b32..f6b0095af4ff 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -1769,9 +1769,7 @@ static driver_t smsc_driver = {
 	.size = sizeof(struct smsc_softc),
 };
 
-static devclass_t smsc_devclass;
-
-DRIVER_MODULE(smsc, uhub, smsc_driver, smsc_devclass, NULL, 0);
+DRIVER_MODULE(smsc, uhub, smsc_driver, NULL, NULL);
 DRIVER_MODULE(miibus, smsc, miibus_driver, 0, 0);
 MODULE_DEPEND(smsc, uether, 1, 1, 1);
 MODULE_DEPEND(smsc, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 98764095dfe2..bc64461b828a 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -170,8 +170,6 @@ static driver_t udav_driver = {
 	.size = sizeof(struct udav_softc),
 };
 
-static devclass_t udav_devclass;
-
 static const STRUCT_USB_HOST_ID udav_devs[] = {
 	/* ShanTou DM9601 USB NIC */
 	{USB_VPI(USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_DM9601, 0)},
@@ -187,7 +185,7 @@ static const STRUCT_USB_HOST_ID udav_devs[] = {
 	    UDAV_FLAG_NO_PHY)},
 };
 
-DRIVER_MODULE(udav, uhub, udav_driver, udav_devclass, NULL, 0);
+DRIVER_MODULE(udav, uhub, udav_driver, NULL, NULL);
 DRIVER_MODULE(miibus, udav, miibus_driver, 0, 0);
 MODULE_DEPEND(udav, uether, 1, 1, 1);
 MODULE_DEPEND(udav, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c
index 187ac9bde396..a4e99cdcfd43 100644
--- a/sys/dev/usb/net/if_ure.c
+++ b/sys/dev/usb/net/if_ure.c
@@ -189,9 +189,7 @@ static driver_t ure_driver = {
 	.size = sizeof(struct ure_softc),
 };
 
-static devclass_t ure_devclass;
-
-DRIVER_MODULE(ure, uhub, ure_driver, ure_devclass, NULL, NULL);
+DRIVER_MODULE(ure, uhub, ure_driver, NULL, NULL);
 DRIVER_MODULE(miibus, ure, miibus_driver, NULL, NULL);
 MODULE_DEPEND(ure, uether, 1, 1, 1);
 MODULE_DEPEND(ure, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c
index 5d3ecb23815c..4ba44f04f775 100644
--- a/sys/dev/usb/net/if_urndis.c
+++ b/sys/dev/usb/net/if_urndis.c
@@ -161,8 +161,6 @@ static driver_t urndis_driver = {
 	.size = sizeof(struct urndis_softc),
 };
 
-static devclass_t urndis_devclass;
-
 static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
 	/* Generic RNDIS class match */
 	{USB_IFACE_CLASS(UICLASS_CDC),
@@ -184,7 +182,7 @@ static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
 		USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
 };
 
-DRIVER_MODULE(urndis, uhub, urndis_driver, urndis_devclass, NULL, NULL);
+DRIVER_MODULE(urndis, uhub, urndis_driver, NULL, NULL);
 MODULE_VERSION(urndis, 1);
 MODULE_DEPEND(urndis, uether, 1, 1, 1);
 MODULE_DEPEND(urndis, usb, 1, 1, 1);
diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
index 8c64ad71be4d..6bf5cb723a0d 100644
--- a/sys/dev/usb/net/if_usie.c
+++ b/sys/dev/usb/net/if_usie.c
@@ -209,10 +209,9 @@ static driver_t usie_driver = {
 	.size = sizeof(struct usie_softc),
 };
 
-static devclass_t usie_devclass;
 static eventhandler_tag usie_etag;
 
-DRIVER_MODULE(usie, uhub, usie_driver, usie_devclass, usie_driver_loaded, 0);
+DRIVER_MODULE(usie, uhub, usie_driver, usie_driver_loaded, NULL);
 MODULE_DEPEND(usie, ucom, 1, 1, 1);
 MODULE_DEPEND(usie, usb, 1, 1, 1);
 MODULE_VERSION(usie, 1);
diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c
index 017d07c3c134..62dcf788833b 100644
--- a/sys/dev/usb/net/ruephy.c
+++ b/sys/dev/usb/net/ruephy.c
@@ -66,15 +66,13 @@ static device_method_t ruephy_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ruephy_devclass;
-
 static driver_t ruephy_driver = {
 	.name = "ruephy",
 	.methods = ruephy_methods,
 	.size = sizeof(struct mii_softc)
 };
 
-DRIVER_MODULE(ruephy, miibus, ruephy_driver, ruephy_devclass, 0, 0);
+DRIVER_MODULE(ruephy, miibus, ruephy_driver, 0, 0);
 
 static int ruephy_service(struct mii_softc *, struct mii_data *, int);
 static void ruephy_reset(struct mii_softc *);
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index 4ff5fcc075d3..9c0fad267f16 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -495,8 +495,7 @@ static driver_t uhso_driver = {
 	.size = sizeof(struct uhso_softc)
 };
 
-static devclass_t uhso_devclass;
-DRIVER_MODULE(uhso, uhub, uhso_driver, uhso_devclass, uhso_driver_loaded, 0);
+DRIVER_MODULE(uhso, uhub, uhso_driver, uhso_driver_loaded, NULL);
 MODULE_DEPEND(uhso, ucom, 1, 1, 1);
 MODULE_DEPEND(uhso, usb, 1, 1, 1);
 MODULE_VERSION(uhso, 1);