From nobody Fri May 06 23:25:04 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 797F21AD0E33; Fri, 6 May 2022 23:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kw69X67ywz3FHv; Fri, 6 May 2022 23:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oAvlGY1F9D79w8cKENiBFoujp5e4ISaRUE+pOeyGBQA=; b=kDEzvrO1RvYXBsNvM7kZT0NZ5YwDPvVDe8rSUTWpDqhsMYqDgq/1hLnSkaTcHyq8MwZCNp rHrZn93trlxnstwmj5mosVCFHpY8t4I+wpJ0JkjIA6/zsAcqh7P3ghMjO4hC4fe6XnB/0k ySmnIj8a+sH3O2lnK0pDMEqOz9yli464wV9yfG5Mn/L9EKo+ZHmlZWwM4nvU6McRJ2KEwg +YSWI36UFZK7S03s9JiEtPRKixZO/HVXfJwudNiQqhLu4qOL1i/u2MF3ZcCzsFn8s2QK73 923CQu7DEwcyLSr7w/VloStduRSsa6Nqwy40y50v9lONGw5ILfDuFk4VbVV/fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 809EB24CFE; Fri, 6 May 2022 23:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 246NP4gi075391; Fri, 6 May 2022 23:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246NP4OM075390; Fri, 6 May 2022 23:25:04 GMT (envelope-from git) Date: Fri, 6 May 2022 23:25:04 GMT Message-Id: <202205062325.246NP4OM075390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bc9372d784c2 - main - usb: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc9372d784c2bd4874f221bf7cd8072cb157dc71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oAvlGY1F9D79w8cKENiBFoujp5e4ISaRUE+pOeyGBQA=; b=yw2rcb23clNT6KhZ6RxoPdZ6pbOU7FXDSfQ1b1g4+eKH26qhyW4sUpFkt4R18tzl0YUHPl F4FuQrzYHkPVNskzSRo6YrOjPTs5lYFletf7Uvk7ob7sJnpw7Y2tYUyCua0Fxpj325GtuP tXPaD4Yp/XPRtfg0ZTxaJ/fgHOUCsrCQaxB7lhGhJL+A37g8S5dOXYnHz6efo3QouORgpE /vf794zUx90JG6sBjqAn8+qUfxEq886xCxNkZw3tlFk7RoX/miU0vDKjAhFtaeGPAN1aSf L2YTugrSXXb5XB7E7boKpRprPZCuctihRX/R9YvuaGM8b/L8n+vrJQokF5bREw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651879505; a=rsa-sha256; cv=none; b=cVW/6gozE5ql8sxCsjKIt+ztiFwKocdTltyezTVwblNegTDZxn6UM3LeYD8OfRq6fVVR0A xLnOpeb1J3ptljpkL8/YKaS0EvVWuTeOJanZzdZJzLADSTEqCDlTiIfbHJz0+mmXNm903B rMCe/EUc2eNn4LUmhQ1IXIZHa/lBshNWIScq13qPa/zoVRYKqokI0ai5FFHSIF75viYN42 nm4HcaqvAP5XIzCtqnh6GRsPvt3azXOdASADEbRDm/uX9KcwewpTYkDqktYUoOI1RwweaH XUtRDJPQnPo6g2rJ1r7XS1n0ld219lqZfTFbgLK1urV4svDz1Hv7Ku7h+X0cbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9372d784c2bd4874f221bf7cd8072cb157dc71 commit bc9372d784c2bd4874f221bf7cd8072cb157dc71 Author: John Baldwin AuthorDate: 2022-05-06 22:46:57 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:46:57 +0000 usb: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/usb/controller/dwc3.c | 3 +-- sys/dev/usb/controller/dwc_otg_acpi.c | 4 +--- sys/dev/usb/controller/dwc_otg_fdt.c | 4 +--- sys/dev/usb/controller/dwc_otg_hisi.c | 5 +---- sys/dev/usb/controller/ehci_fsl.c | 4 +--- sys/dev/usb/controller/ehci_imx.c | 8 ++------ sys/dev/usb/controller/ehci_msm.c | 4 +--- sys/dev/usb/controller/ehci_mv.c | 4 +--- sys/dev/usb/controller/ehci_pci.c | 4 +--- sys/dev/usb/controller/generic_ehci_acpi.c | 4 +--- sys/dev/usb/controller/generic_ehci_fdt.c | 4 +--- sys/dev/usb/controller/generic_ohci.c | 5 +---- sys/dev/usb/controller/generic_xhci_acpi.c | 4 +--- sys/dev/usb/controller/generic_xhci_fdt.c | 4 +--- sys/dev/usb/controller/musb_otg_allwinner.c | 4 +--- sys/dev/usb/controller/ohci_pci.c | 4 +--- sys/dev/usb/controller/uhci_pci.c | 4 +--- sys/dev/usb/controller/usb_controller.c | 20 +++++++++----------- sys/dev/usb/controller/usb_nop_xceiv.c | 4 +--- sys/dev/usb/controller/xhci_pci.c | 4 +--- sys/dev/usb/gadget/g_audio.c | 4 +--- sys/dev/usb/gadget/g_keyboard.c | 4 +--- sys/dev/usb/gadget/g_modem.c | 4 +--- sys/dev/usb/gadget/g_mouse.c | 4 +--- sys/dev/usb/input/atp.c | 4 +--- sys/dev/usb/input/uep.c | 4 +--- sys/dev/usb/input/uhid.c | 8 -------- sys/dev/usb/input/uhid_snes.c | 4 +--- sys/dev/usb/input/ukbd.c | 4 +--- sys/dev/usb/input/ums.c | 4 +--- sys/dev/usb/input/usbhid.c | 4 +--- sys/dev/usb/input/wmt.c | 4 +--- sys/dev/usb/input/wsp.c | 4 +--- sys/dev/usb/misc/cp2112.c | 12 +++--------- sys/dev/usb/misc/udbp.c | 4 +--- sys/dev/usb/misc/ugold.c | 4 +--- sys/dev/usb/misc/uled.c | 4 +--- sys/dev/usb/net/if_aue.c | 4 +--- sys/dev/usb/net/if_axe.c | 4 +--- sys/dev/usb/net/if_axge.c | 4 +--- sys/dev/usb/net/if_cdce.c | 3 +-- sys/dev/usb/net/if_cdceem.c | 4 +--- sys/dev/usb/net/if_cue.c | 4 +--- sys/dev/usb/net/if_ipheth.c | 4 +--- sys/dev/usb/net/if_kue.c | 4 +--- sys/dev/usb/net/if_mos.c | 4 +--- sys/dev/usb/net/if_muge.c | 4 +--- sys/dev/usb/net/if_rue.c | 5 +---- sys/dev/usb/net/if_smsc.c | 4 +--- sys/dev/usb/net/if_udav.c | 4 +--- sys/dev/usb/net/if_ure.c | 4 +--- sys/dev/usb/net/if_urndis.c | 4 +--- sys/dev/usb/net/if_usie.c | 3 +-- sys/dev/usb/net/ruephy.c | 4 +--- sys/dev/usb/net/uhso.c | 3 +-- sys/dev/usb/serial/u3g.c | 4 +--- sys/dev/usb/serial/uark.c | 4 +--- sys/dev/usb/serial/ubsa.c | 4 +--- sys/dev/usb/serial/ubser.c | 4 +--- sys/dev/usb/serial/uchcom.c | 4 +--- sys/dev/usb/serial/ucycom.c | 4 +--- sys/dev/usb/serial/ufoma.c | 4 +--- sys/dev/usb/serial/uftdi.c | 4 +--- sys/dev/usb/serial/ugensa.c | 4 +--- sys/dev/usb/serial/uipaq.c | 4 +--- sys/dev/usb/serial/ulpt.c | 4 +--- sys/dev/usb/serial/umcs.c | 4 +--- sys/dev/usb/serial/umct.c | 4 +--- sys/dev/usb/serial/umodem.c | 4 +--- sys/dev/usb/serial/umoscom.c | 4 +--- sys/dev/usb/serial/uplcom.c | 4 +--- sys/dev/usb/serial/uslcom.c | 4 +--- sys/dev/usb/serial/uvisor.c | 4 +--- sys/dev/usb/serial/uvscom.c | 4 +--- sys/dev/usb/storage/cfumass.c | 4 +--- sys/dev/usb/storage/umass.c | 4 +--- sys/dev/usb/storage/urio.c | 4 +--- sys/dev/usb/storage/ustorage_fs.c | 4 +--- sys/dev/usb/usb_hub.c | 6 ++---- sys/dev/usb/usb_hub_acpi.c | 5 ++--- sys/dev/usb/video/udl.c | 4 +--- sys/dev/usb/wlan/if_rsu.c | 4 +--- sys/dev/usb/wlan/if_rum.c | 4 +--- sys/dev/usb/wlan/if_run.c | 4 +--- sys/dev/usb/wlan/if_uath.c | 4 ++-- sys/dev/usb/wlan/if_upgt.c | 4 +--- sys/dev/usb/wlan/if_ural.c | 4 +--- sys/dev/usb/wlan/if_urtw.c | 4 ++-- sys/dev/usb/wlan/if_zyd.c | 4 +--- 89 files changed, 103 insertions(+), 287 deletions(-) diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c index d4422caf0fcd..9847afb952eb 100644 --- a/sys/dev/usb/controller/dwc3.c +++ b/sys/dev/usb/controller/dwc3.c @@ -347,6 +347,5 @@ static driver_t snps_dwc3_driver = { sizeof(struct snps_dwc3_softc) }; -static devclass_t snps_dwc3_devclass; -DRIVER_MODULE(snps_dwc3, simplebus, snps_dwc3_driver, snps_dwc3_devclass, 0, 0); +DRIVER_MODULE(snps_dwc3, simplebus, snps_dwc3_driver, 0, 0); MODULE_DEPEND(snps_dwc3, xhci, 1, 1, 1); diff --git a/sys/dev/usb/controller/dwc_otg_acpi.c b/sys/dev/usb/controller/dwc_otg_acpi.c index c6154eabc15a..cd574706c62f 100644 --- a/sys/dev/usb/controller/dwc_otg_acpi.c +++ b/sys/dev/usb/controller/dwc_otg_acpi.c @@ -178,7 +178,5 @@ static driver_t dwc_otg_driver = { .size = sizeof(struct dwc_otg_softc), }; -static devclass_t dwc_otg_devclass; - -DRIVER_MODULE(dwcotg, acpi, dwc_otg_driver, dwc_otg_devclass, 0, 0); +DRIVER_MODULE(dwcotg, acpi, dwc_otg_driver, 0, 0); MODULE_DEPEND(dwcotg, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/dwc_otg_fdt.c b/sys/dev/usb/controller/dwc_otg_fdt.c index de47a543680b..cd6a28264079 100644 --- a/sys/dev/usb/controller/dwc_otg_fdt.c +++ b/sys/dev/usb/controller/dwc_otg_fdt.c @@ -214,7 +214,5 @@ driver_t dwc_otg_driver = { .size = sizeof(struct dwc_otg_fdt_softc), }; -static devclass_t dwc_otg_devclass; - -DRIVER_MODULE(dwcotg, simplebus, dwc_otg_driver, dwc_otg_devclass, 0, 0); +DRIVER_MODULE(dwcotg, simplebus, dwc_otg_driver, 0, 0); MODULE_DEPEND(dwcotg, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/dwc_otg_hisi.c b/sys/dev/usb/controller/dwc_otg_hisi.c index 2adaa71cfb3b..eb7c3074729f 100644 --- a/sys/dev/usb/controller/dwc_otg_hisi.c +++ b/sys/dev/usb/controller/dwc_otg_hisi.c @@ -88,10 +88,7 @@ static device_method_t hisi_dwc_otg_methods[] = { DEVMETHOD_END }; -static devclass_t hisi_dwc_otg_devclass; - DEFINE_CLASS_1(hisi_dwcotg, hisi_dwc_otg_driver, hisi_dwc_otg_methods, sizeof(struct dwc_otg_fdt_softc), dwc_otg_driver); -DRIVER_MODULE(hisi_dwcotg, simplebus, hisi_dwc_otg_driver, - hisi_dwc_otg_devclass, 0, 0); +DRIVER_MODULE(hisi_dwcotg, simplebus, hisi_dwc_otg_driver, 0, 0); MODULE_DEPEND(hisi_dwcotg, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c index 01f758837d75..1e44c5d07655 100644 --- a/sys/dev/usb/controller/ehci_fsl.c +++ b/sys/dev/usb/controller/ehci_fsl.c @@ -93,9 +93,7 @@ static driver_t ehci_driver = { sizeof(struct ehci_softc) }; -static devclass_t ehci_devclass; - -DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0); +DRIVER_MODULE(ehci, simplebus, ehci_driver, 0, 0); MODULE_DEPEND(ehci, usb, 1, 1, 1); /* diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c index a93b187f84cd..b89fefb44be6 100644 --- a/sys/dev/usb/controller/ehci_imx.c +++ b/sys/dev/usb/controller/ehci_imx.c @@ -241,15 +241,13 @@ static driver_t imx_usbmisc_driver = { sizeof(struct imx_usbmisc_softc) }; -static devclass_t imx_usbmisc_devclass; - /* * This driver needs to start before the ehci driver, but later than the usual * "special" drivers like clocks and cpu. Ehci starts at DEFAULT so * DEFAULT-1000 seems good. */ EARLY_DRIVER_MODULE(imx_usbmisc, simplebus, imx_usbmisc_driver, - imx_usbmisc_devclass, 0, 0, BUS_PASS_DEFAULT - 1000); + 0, 0, BUS_PASS_DEFAULT - 1000); /*----------------------------------------------------------------------------- * imx_ehci driver... @@ -507,7 +505,5 @@ static driver_t ehci_driver = { sizeof(struct imx_ehci_softc) }; -static devclass_t ehci_devclass; - -DRIVER_MODULE(imx_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0); +DRIVER_MODULE(imx_ehci, simplebus, ehci_driver, 0, 0); MODULE_DEPEND(imx_ehci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/ehci_msm.c b/sys/dev/usb/controller/ehci_msm.c index 1920f9c3854b..015c8a99d5e3 100644 --- a/sys/dev/usb/controller/ehci_msm.c +++ b/sys/dev/usb/controller/ehci_msm.c @@ -224,7 +224,5 @@ static driver_t ehci_driver = { .size = sizeof(ehci_softc_t), }; -static devclass_t ehci_devclass; - -DRIVER_MODULE(ehci_msm, simplebus, ehci_driver, ehci_devclass, 0, 0); +DRIVER_MODULE(ehci_msm, simplebus, ehci_driver, 0, 0); MODULE_DEPEND(ehci_msm, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index b0687bd62467..802310887043 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -381,7 +381,5 @@ static driver_t ehci_driver = { sizeof(ehci_softc_t), }; -static devclass_t ehci_devclass; - -DRIVER_MODULE(ehci_mv, simplebus, ehci_driver, ehci_devclass, 0, 0); +DRIVER_MODULE(ehci_mv, simplebus, ehci_driver, 0, 0); MODULE_DEPEND(ehci_mv, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index dbc2def5b8d2..ae285375228f 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -593,7 +593,5 @@ static driver_t ehci_driver = { .size = sizeof(struct ehci_softc), }; -static devclass_t ehci_devclass; - -DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0); +DRIVER_MODULE(ehci, pci, ehci_driver, 0, 0); MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/generic_ehci_acpi.c b/sys/dev/usb/controller/generic_ehci_acpi.c index 2f59728140bf..105502dc6e50 100644 --- a/sys/dev/usb/controller/generic_ehci_acpi.c +++ b/sys/dev/usb/controller/generic_ehci_acpi.c @@ -80,7 +80,5 @@ static device_method_t ehci_acpi_methods[] = { DEFINE_CLASS_1(ehci, ehci_acpi_driver, ehci_acpi_methods, sizeof(ehci_softc_t), generic_ehci_driver); -static devclass_t ehci_acpi_devclass; - -DRIVER_MODULE(ehci, acpi, ehci_acpi_driver, ehci_acpi_devclass, 0, 0); +DRIVER_MODULE(ehci, acpi, ehci_acpi_driver, 0, 0); MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c index a660674cbace..0d856a48de79 100644 --- a/sys/dev/usb/controller/generic_ehci_fdt.c +++ b/sys/dev/usb/controller/generic_ehci_fdt.c @@ -237,7 +237,5 @@ static device_method_t ehci_fdt_methods[] = { DEFINE_CLASS_1(ehci, ehci_fdt_driver, ehci_fdt_methods, sizeof(ehci_softc_t), generic_ehci_driver); -static devclass_t ehci_fdt_devclass; - -DRIVER_MODULE(generic_ehci, simplebus, ehci_fdt_driver, ehci_fdt_devclass, 0, 0); +DRIVER_MODULE(generic_ehci, simplebus, ehci_fdt_driver, 0, 0); MODULE_DEPEND(generic_ehci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c index 8dd9bc50abc7..6260736d7cc3 100644 --- a/sys/dev/usb/controller/generic_ohci.c +++ b/sys/dev/usb/controller/generic_ohci.c @@ -327,8 +327,5 @@ driver_t generic_ohci_driver = { .size = sizeof(struct generic_ohci_softc), }; -static devclass_t generic_ohci_devclass; - -DRIVER_MODULE(ohci, simplebus, generic_ohci_driver, - generic_ohci_devclass, 0, 0); +DRIVER_MODULE(ohci, simplebus, generic_ohci_driver, 0, 0); MODULE_DEPEND(ohci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/generic_xhci_acpi.c b/sys/dev/usb/controller/generic_xhci_acpi.c index 1594fa8c6670..b354c3227b98 100644 --- a/sys/dev/usb/controller/generic_xhci_acpi.c +++ b/sys/dev/usb/controller/generic_xhci_acpi.c @@ -77,7 +77,5 @@ static device_method_t xhci_acpi_methods[] = { DEFINE_CLASS_1(xhci, xhci_acpi_driver, xhci_acpi_methods, sizeof(struct xhci_softc), generic_xhci_driver); -static devclass_t xhci_acpi_devclass; - -DRIVER_MODULE(xhci, acpi, xhci_acpi_driver, xhci_acpi_devclass, 0, 0); +DRIVER_MODULE(xhci, acpi, xhci_acpi_driver, 0, 0); MODULE_DEPEND(xhci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c index ea34c2077e43..bc3d78638cad 100644 --- a/sys/dev/usb/controller/generic_xhci_fdt.c +++ b/sys/dev/usb/controller/generic_xhci_fdt.c @@ -124,7 +124,5 @@ static device_method_t xhci_fdt_methods[] = { DEFINE_CLASS_1(xhci, xhci_fdt_driver, xhci_fdt_methods, sizeof(struct xhci_softc), generic_xhci_driver); -static devclass_t xhci_fdt_devclass; - -DRIVER_MODULE(xhci, simplebus, xhci_fdt_driver, xhci_fdt_devclass, 0, 0); +DRIVER_MODULE(xhci, simplebus, xhci_fdt_driver, 0, 0); MODULE_DEPEND(xhci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c index bd23b23fb036..827cf202df5f 100644 --- a/sys/dev/usb/controller/musb_otg_allwinner.c +++ b/sys/dev/usb/controller/musb_otg_allwinner.c @@ -621,7 +621,5 @@ static driver_t awusbdrd_driver = { .size = sizeof(struct awusbdrd_softc), }; -static devclass_t awusbdrd_devclass; - -DRIVER_MODULE(musbotg, simplebus, awusbdrd_driver, awusbdrd_devclass, 0, 0); +DRIVER_MODULE(musbotg, simplebus, awusbdrd_driver, 0, 0); MODULE_DEPEND(musbotg, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index 8c3ee521b5b1..b9d90ba5432d 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -381,7 +381,5 @@ static driver_t ohci_driver = { .size = sizeof(struct ohci_softc), }; -static devclass_t ohci_devclass; - -DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0); +DRIVER_MODULE(ohci, pci, ohci_driver, 0, 0); MODULE_DEPEND(ohci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index c24a34eda283..370be7519109 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -456,7 +456,5 @@ static driver_t uhci_driver = { .size = sizeof(struct uhci_softc), }; -static devclass_t uhci_devclass; - -DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0); +DRIVER_MODULE(uhci, pci, uhci_driver, 0, 0); MODULE_DEPEND(uhci, usb, 1, 1, 1); diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index fd9bcd5ee524..0897af0492cb 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -106,8 +106,6 @@ static int usb_no_shutdown_wait = 0; SYSCTL_INT(_hw_usb, OID_AUTO, no_shutdown_wait, CTLFLAG_RWTUN, &usb_no_shutdown_wait, 0, "No USB device waiting at system shutdown."); -static devclass_t usb_devclass; - static device_method_t usb_methods[] = { DEVMETHOD(device_probe, usb_probe), DEVMETHOD(device_attach, usb_attach), @@ -126,19 +124,19 @@ static driver_t usb_driver = { }; /* Host Only Drivers */ -DRIVER_MODULE(usbus, ohci, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, uhci, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, ehci, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, xhci, usb_driver, usb_devclass, 0, 0); +DRIVER_MODULE(usbus, ohci, usb_driver, 0, 0); +DRIVER_MODULE(usbus, uhci, usb_driver, 0, 0); +DRIVER_MODULE(usbus, ehci, usb_driver, 0, 0); +DRIVER_MODULE(usbus, xhci, usb_driver, 0, 0); /* Device Only Drivers */ -DRIVER_MODULE(usbus, musbotg, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, uss820dci, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, octusb, usb_driver, usb_devclass, 0, 0); +DRIVER_MODULE(usbus, musbotg, usb_driver, 0, 0); +DRIVER_MODULE(usbus, uss820dci, usb_driver, 0, 0); +DRIVER_MODULE(usbus, octusb, usb_driver, 0, 0); /* Dual Mode Drivers */ -DRIVER_MODULE(usbus, dwcotg, usb_driver, usb_devclass, 0, 0); -DRIVER_MODULE(usbus, saf1761otg, usb_driver, usb_devclass, 0, 0); +DRIVER_MODULE(usbus, dwcotg, usb_driver, 0, 0); +DRIVER_MODULE(usbus, saf1761otg, usb_driver, 0, 0); /*------------------------------------------------------------------------* * usb_probe diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c index b2dece4c1e3d..02db13595f3d 100644 --- a/sys/dev/usb/controller/usb_nop_xceiv.c +++ b/sys/dev/usb/controller/usb_nop_xceiv.c @@ -199,8 +199,6 @@ static device_method_t usb_nop_xceiv_methods[] = { DEVMETHOD_END }; -static devclass_t usb_nop_xceiv_devclass; - static driver_t usb_nop_xceiv_driver = { "usb_nop_xceiv", usb_nop_xceiv_methods, @@ -208,4 +206,4 @@ static driver_t usb_nop_xceiv_driver = { }; EARLY_DRIVER_MODULE(usb_nop_xceiv, simplebus, usb_nop_xceiv_driver, - usb_nop_xceiv_devclass, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); + 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index c35cd08b3341..e87489f32d14 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -85,9 +85,7 @@ static device_method_t xhci_device_methods[] = { DEFINE_CLASS_0(xhci, xhci_pci_driver, xhci_device_methods, sizeof(struct xhci_softc)); -static devclass_t xhci_devclass; - -DRIVER_MODULE(xhci, pci, xhci_pci_driver, xhci_devclass, NULL, NULL); +DRIVER_MODULE(xhci, pci, xhci_pci_driver, NULL, NULL); MODULE_DEPEND(xhci, usb, 1, 1, 1); static const char * diff --git a/sys/dev/usb/gadget/g_audio.c b/sys/dev/usb/gadget/g_audio.c index 2ab6642cb123..52ce518d9ef9 100644 --- a/sys/dev/usb/gadget/g_audio.c +++ b/sys/dev/usb/gadget/g_audio.c @@ -134,8 +134,6 @@ static usb_handle_request_t g_audio_handle_request; static usb_callback_t g_audio_isoc_read_callback; static usb_callback_t g_audio_isoc_write_callback; -static devclass_t g_audio_devclass; - static void g_audio_watchdog(void *arg); static void g_audio_timeout(void *arg); @@ -157,7 +155,7 @@ static driver_t g_audio_driver = { .size = sizeof(struct g_audio_softc), }; -DRIVER_MODULE(g_audio, uhub, g_audio_driver, g_audio_devclass, 0, 0); +DRIVER_MODULE(g_audio, uhub, g_audio_driver, 0, 0); MODULE_DEPEND(g_audio, usb, 1, 1, 1); static const struct usb_config g_audio_config[G_AUDIO_N_TRANSFER] = { diff --git a/sys/dev/usb/gadget/g_keyboard.c b/sys/dev/usb/gadget/g_keyboard.c index d88e0ea432ce..6660e2bc9acc 100644 --- a/sys/dev/usb/gadget/g_keyboard.c +++ b/sys/dev/usb/gadget/g_keyboard.c @@ -133,8 +133,6 @@ static device_detach_t g_keyboard_detach; static usb_handle_request_t g_keyboard_handle_request; static usb_callback_t g_keyboard_intr_callback; -static devclass_t g_keyboard_devclass; - static device_method_t g_keyboard_methods[] = { /* USB interface */ DEVMETHOD(usb_handle_request, g_keyboard_handle_request), @@ -153,7 +151,7 @@ static driver_t g_keyboard_driver = { .size = sizeof(struct g_keyboard_softc), }; -DRIVER_MODULE(g_keyboard, uhub, g_keyboard_driver, g_keyboard_devclass, 0, 0); +DRIVER_MODULE(g_keyboard, uhub, g_keyboard_driver, 0, 0); MODULE_DEPEND(g_keyboard, usb, 1, 1, 1); static const struct usb_config g_keyboard_config[G_KEYBOARD_N_TRANSFER] = { diff --git a/sys/dev/usb/gadget/g_modem.c b/sys/dev/usb/gadget/g_modem.c index 02593a9ce5fe..3df9a6ce13a1 100644 --- a/sys/dev/usb/gadget/g_modem.c +++ b/sys/dev/usb/gadget/g_modem.c @@ -132,8 +132,6 @@ static usb_callback_t g_modem_bulk_write_callback; static void g_modem_timeout(void *arg); -static devclass_t g_modem_devclass; - static device_method_t g_modem_methods[] = { /* USB interface */ DEVMETHOD(usb_handle_request, g_modem_handle_request), @@ -152,7 +150,7 @@ static driver_t g_modem_driver = { .size = sizeof(struct g_modem_softc), }; -DRIVER_MODULE(g_modem, uhub, g_modem_driver, g_modem_devclass, 0, 0); +DRIVER_MODULE(g_modem, uhub, g_modem_driver, 0, 0); MODULE_DEPEND(g_modem, usb, 1, 1, 1); static const struct usb_config g_modem_config[G_MODEM_N_TRANSFER] = { diff --git a/sys/dev/usb/gadget/g_mouse.c b/sys/dev/usb/gadget/g_mouse.c index ce78b5aaa737..87786da28157 100644 --- a/sys/dev/usb/gadget/g_mouse.c +++ b/sys/dev/usb/gadget/g_mouse.c @@ -131,8 +131,6 @@ static device_detach_t g_mouse_detach; static usb_handle_request_t g_mouse_handle_request; static usb_callback_t g_mouse_intr_callback; -static devclass_t g_mouse_devclass; - static device_method_t g_mouse_methods[] = { /* USB interface */ DEVMETHOD(usb_handle_request, g_mouse_handle_request), @@ -151,7 +149,7 @@ static driver_t g_mouse_driver = { .size = sizeof(struct g_mouse_softc), }; -DRIVER_MODULE(g_mouse, uhub, g_mouse_driver, g_mouse_devclass, 0, 0); +DRIVER_MODULE(g_mouse, uhub, g_mouse_driver, 0, 0); MODULE_DEPEND(g_mouse, usb, 1, 1, 1); static const struct usb_config g_mouse_config[G_MOUSE_N_TRANSFER] = { diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c index b76653cc303b..2f5487835c5e 100644 --- a/sys/dev/usb/input/atp.c +++ b/sys/dev/usb/input/atp.c @@ -2615,8 +2615,6 @@ atp_sysctl_scale_factor_handler(SYSCTL_HANDLER_ARGS) return (0); } -static devclass_t atp_devclass; - static device_method_t atp_methods[] = { DEVMETHOD(device_probe, atp_probe), DEVMETHOD(device_attach, atp_attach), @@ -2631,7 +2629,7 @@ static driver_t atp_driver = { .size = sizeof(struct atp_softc) }; -DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, NULL, 0); +DRIVER_MODULE(atp, uhub, atp_driver, NULL, NULL); MODULE_DEPEND(atp, usb, 1, 1, 1); MODULE_DEPEND(atp, hid, 1, 1, 1); MODULE_VERSION(atp, 1); diff --git a/sys/dev/usb/input/uep.c b/sys/dev/usb/input/uep.c index 5fece855e650..048d133bac9d 100644 --- a/sys/dev/usb/input/uep.c +++ b/sys/dev/usb/input/uep.c @@ -517,8 +517,6 @@ uep_close(struct usb_fifo *fifo, int fflags) } #endif /* !EVDEV_SUPPORT */ -static devclass_t uep_devclass; - static device_method_t uep_methods[] = { DEVMETHOD(device_probe, uep_probe), DEVMETHOD(device_attach, uep_attach), @@ -532,7 +530,7 @@ static driver_t uep_driver = { .size = sizeof(struct uep_softc), }; -DRIVER_MODULE(uep, uhub, uep_driver, uep_devclass, NULL, NULL); +DRIVER_MODULE(uep, uhub, uep_driver, NULL, NULL); MODULE_DEPEND(uep, usb, 1, 1, 1); #ifdef EVDEV_SUPPORT MODULE_DEPEND(uep, evdev, 1, 1, 1); diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index d877773625d7..d795e8fa6bbc 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -912,10 +912,6 @@ uhid_detach(device_t dev) return (0); } -#ifndef HIDRAW_MAKE_UHID_ALIAS -static devclass_t uhid_devclass; -#endif - static device_method_t uhid_methods[] = { DEVMETHOD(device_probe, uhid_probe), DEVMETHOD(device_attach, uhid_attach), @@ -934,11 +930,7 @@ static driver_t uhid_driver = { .size = sizeof(struct uhid_softc), }; -#ifdef HIDRAW_MAKE_UHID_ALIAS DRIVER_MODULE(uhid, uhub, uhid_driver, NULL, NULL); -#else -DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0); -#endif MODULE_DEPEND(uhid, usb, 1, 1, 1); MODULE_DEPEND(uhid, hid, 1, 1, 1); MODULE_VERSION(uhid, 1); diff --git a/sys/dev/usb/input/uhid_snes.c b/sys/dev/usb/input/uhid_snes.c index d786b0e1f257..d6642752be8b 100644 --- a/sys/dev/usb/input/uhid_snes.c +++ b/sys/dev/usb/input/uhid_snes.c @@ -638,8 +638,6 @@ static driver_t uhid_snes_driver = { sizeof(struct uhid_snes_softc) }; -static devclass_t uhid_snes_devclass; - -DRIVER_MODULE(uhid_snes, uhub, uhid_snes_driver, uhid_snes_devclass, NULL, 0); +DRIVER_MODULE(uhid_snes, uhub, uhid_snes_driver, NULL, NULL); MODULE_DEPEND(uhid_snes, usb, 1, 1, 1); USB_PNP_HOST_INFO(snes_devs); diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c index f2ff476150ff..4353888505da 100644 --- a/sys/dev/usb/input/ukbd.c +++ b/sys/dev/usb/input/ukbd.c @@ -2173,8 +2173,6 @@ ukbd_driver_load(module_t mod, int what, void *arg) return (0); } -static devclass_t ukbd_devclass; - static device_method_t ukbd_methods[] = { DEVMETHOD(device_probe, ukbd_probe), DEVMETHOD(device_attach, ukbd_attach), @@ -2190,7 +2188,7 @@ static driver_t ukbd_driver = { .size = sizeof(struct ukbd_softc), }; -DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); +DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_driver_load, NULL); MODULE_DEPEND(ukbd, usb, 1, 1, 1); MODULE_DEPEND(ukbd, hid, 1, 1, 1); #ifdef EVDEV_SUPPORT diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c index cce1831287e4..5b3ac2af4cd0 100644 --- a/sys/dev/usb/input/ums.c +++ b/sys/dev/usb/input/ums.c @@ -1200,8 +1200,6 @@ ums_sysctl_handler_parseinfo(SYSCTL_HANDLER_ARGS) return (err); } -static devclass_t ums_devclass; - static device_method_t ums_methods[] = { DEVMETHOD(device_probe, ums_probe), DEVMETHOD(device_attach, ums_attach), @@ -1216,7 +1214,7 @@ static driver_t ums_driver = { .size = sizeof(struct ums_softc), }; -DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0); +DRIVER_MODULE(ums, uhub, ums_driver, NULL, NULL); MODULE_DEPEND(ums, usb, 1, 1, 1); MODULE_DEPEND(ums, hid, 1, 1, 1); #ifdef EVDEV_SUPPORT diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c index 3b7886f0fada..fe53f11b8f40 100644 --- a/sys/dev/usb/input/usbhid.c +++ b/sys/dev/usb/input/usbhid.c @@ -860,8 +860,6 @@ usbhid_detach(device_t dev) return (0); } -static devclass_t usbhid_devclass; - static device_method_t usbhid_methods[] = { DEVMETHOD(device_probe, usbhid_probe), DEVMETHOD(device_attach, usbhid_attach), @@ -892,7 +890,7 @@ static driver_t usbhid_driver = { .size = sizeof(struct usbhid_softc), }; -DRIVER_MODULE(usbhid, uhub, usbhid_driver, usbhid_devclass, NULL, 0); +DRIVER_MODULE(usbhid, uhub, usbhid_driver, NULL, NULL); MODULE_DEPEND(usbhid, usb, 1, 1, 1); MODULE_DEPEND(usbhid, hid, 1, 1, 1); MODULE_DEPEND(usbhid, hidbus, 1, 1, 1); diff --git a/sys/dev/usb/input/wmt.c b/sys/dev/usb/input/wmt.c index 661fa622433f..5fedd846d258 100644 --- a/sys/dev/usb/input/wmt.c +++ b/sys/dev/usb/input/wmt.c @@ -1001,8 +1001,6 @@ static const STRUCT_USB_HOST_ID wmt_devs[] = { USB_IFACE_SUBCLASS(0),}, }; -static devclass_t wmt_devclass; - static device_method_t wmt_methods[] = { DEVMETHOD(device_probe, wmt_probe), DEVMETHOD(device_attach, wmt_attach), @@ -1017,7 +1015,7 @@ static driver_t wmt_driver = { .size = sizeof(struct wmt_softc), }; -DRIVER_MODULE(wmt, uhub, wmt_driver, wmt_devclass, NULL, 0); +DRIVER_MODULE(wmt, uhub, wmt_driver, NULL, NULL); MODULE_DEPEND(wmt, usb, 1, 1, 1); MODULE_DEPEND(wmt, hid, 1, 1, 1); MODULE_DEPEND(wmt, evdev, 1, 1, 1); diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c index c2da3df598c5..c0ca9f192c45 100644 --- a/sys/dev/usb/input/wsp.c +++ b/sys/dev/usb/input/wsp.c @@ -1566,9 +1566,7 @@ static driver_t wsp_driver = { .size = sizeof(struct wsp_softc) }; -static devclass_t wsp_devclass; - -DRIVER_MODULE(wsp, uhub, wsp_driver, wsp_devclass, NULL, 0); +DRIVER_MODULE(wsp, uhub, wsp_driver, NULL, NULL); MODULE_DEPEND(wsp, usb, 1, 1, 1); MODULE_DEPEND(wsp, hid, 1, 1, 1); #ifdef EVDEV_SUPPORT diff --git a/sys/dev/usb/misc/cp2112.c b/sys/dev/usb/misc/cp2112.c index edc5a2499660..4a795bf89fc8 100644 --- a/sys/dev/usb/misc/cp2112.c +++ b/sys/dev/usb/misc/cp2112.c @@ -1388,9 +1388,7 @@ static driver_t cp2112hid_driver = { .size = sizeof(struct cp2112_softc), }; -static devclass_t cp2112hid_devclass; -DRIVER_MODULE(cp2112hid, uhub, cp2112hid_driver, cp2112hid_devclass, - NULL, NULL); +DRIVER_MODULE(cp2112hid, uhub, cp2112hid_driver, NULL, NULL); MODULE_DEPEND(cp2112hid, usb, 1, 1, 1); MODULE_VERSION(cp2112hid, 1); USB_PNP_HOST_INFO(cp2112_devs); @@ -1421,9 +1419,7 @@ static driver_t cp2112gpio_driver = { .size = sizeof(struct cp2112gpio_softc), }; -static devclass_t cp2112gpio_devclass; -DRIVER_MODULE(cp2112gpio, cp2112hid, cp2112gpio_driver, cp2112gpio_devclass, - NULL, NULL); +DRIVER_MODULE(cp2112gpio, cp2112hid, cp2112gpio_driver, NULL, NULL); MODULE_DEPEND(cp2112gpio, cp2112hid, 1, 1, 1); MODULE_DEPEND(cp2112gpio, gpiobus, 1, 1, 1); MODULE_VERSION(cp2112gpio, 1); @@ -1448,9 +1444,7 @@ static driver_t cp2112iic_driver = { sizeof(struct cp2112iic_softc) }; -static devclass_t cp2112iic_devclass; -DRIVER_MODULE(cp2112iic, cp2112hid, cp2112iic_driver, cp2112iic_devclass, - NULL, NULL); +DRIVER_MODULE(cp2112iic, cp2112hid, cp2112iic_driver, NULL, NULL); MODULE_DEPEND(cp2112iic, cp2112hid, 1, 1, 1); MODULE_DEPEND(cp2112iic, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(cp2112iic, 1); diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c index 8d987dee00c8..95c2b6fb5141 100644 --- a/sys/dev/usb/misc/udbp.c +++ b/sys/dev/usb/misc/udbp.c @@ -241,8 +241,6 @@ static const struct usb_config udbp_config[UDBP_T_MAX] = { }, }; -static devclass_t udbp_devclass; - static device_method_t udbp_methods[] = { /* Device interface */ DEVMETHOD(device_probe, udbp_probe), @@ -269,7 +267,7 @@ static const STRUCT_USB_HOST_ID udbp_devs[] = { {USB_VPI(USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL620USB, 0)}, }; -DRIVER_MODULE(udbp, uhub, udbp_driver, udbp_devclass, udbp_modload, 0); +DRIVER_MODULE(udbp, uhub, udbp_driver, udbp_modload, NULL); MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); MODULE_DEPEND(udbp, usb, 1, 1, 1); MODULE_VERSION(udbp, 1); diff --git a/sys/dev/usb/misc/ugold.c b/sys/dev/usb/misc/ugold.c index 0057d042006d..8316b2924020 100644 --- a/sys/dev/usb/misc/ugold.c +++ b/sys/dev/usb/misc/ugold.c @@ -122,8 +122,6 @@ static usb_proc_callback_t ugold_readout_msg; static usb_callback_t ugold_intr_callback; -static devclass_t ugold_devclass; - static device_method_t ugold_methods[] = { DEVMETHOD(device_probe, ugold_probe), DEVMETHOD(device_attach, ugold_attach), @@ -142,7 +140,7 @@ static const STRUCT_USB_HOST_ID ugold_devs[] = { {USB_VPI(USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TEMPER, 0)}, }; -DRIVER_MODULE(ugold, uhub, ugold_driver, ugold_devclass, NULL, NULL); +DRIVER_MODULE(ugold, uhub, ugold_driver, NULL, NULL); MODULE_DEPEND(ugold, usb, 1, 1, 1); MODULE_DEPEND(ugold, hid, 1, 1, 1); MODULE_VERSION(ugold, 1); diff --git a/sys/dev/usb/misc/uled.c b/sys/dev/usb/misc/uled.c index 239b251f2deb..e991fbedaa7d 100644 --- a/sys/dev/usb/misc/uled.c +++ b/sys/dev/usb/misc/uled.c @@ -97,8 +97,6 @@ static usb_error_t uled_ctrl_msg(struct uled_softc *, uint8_t, uint8_t, uint16_t, uint16_t, void *, uint16_t); static int uled_enable(struct uled_softc *); -static devclass_t uled_devclass; - static device_method_t uled_methods[] = { DEVMETHOD(device_probe, uled_probe), DEVMETHOD(device_attach, uled_attach), @@ -120,7 +118,7 @@ static const STRUCT_USB_HOST_ID uled_devs[] = { #undef ULED_DEV }; -DRIVER_MODULE(uled, uhub, uled_driver, uled_devclass, NULL, NULL); +DRIVER_MODULE(uled, uhub, uled_driver, NULL, NULL); MODULE_DEPEND(uled, usb, 1, 1, 1); MODULE_VERSION(uled, 1); USB_PNP_HOST_INFO(uled_devs); 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 *** 801 LINES SKIPPED ***