From nobody Mon May 9 19:23:13 2022 X-Original-To: dev-commits-src-all@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 E75FF1AC3A28; Mon, 9 May 2022 19:23:15 +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 4Kxrg60htpz3pS3; Mon, 9 May 2022 19:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124194; 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=80s1Dj9bXfDv2/rrjw0bq7TwfGnTDxb3qHj/pxdn9+Y=; b=S/Nx+Hna6XE/4KXwse+G8fNlo3pU628aSjAV78zSkhlK5tprAOW7ew1JhjnYedyEHIE1ym P6vUL028WdO/gDyFAefnDlyjeG4Oh2JqnGi8tWbjZaClqrcvUTd76ns32cPDqIIEbvr7Cu hs7AcXtjl08eneCpLLOcWdsHE2xA8CuxtVuttinZtuoVvDnPAp5fEgUpKJoSrATq6w3x73 sJYCDA+mtzn+BajZUkjLsLTBCfd2osQvUiiyDn/07aPdE3bC3f9Rgx7HfnTGsBDVE+FUuw 5oqv9rhExga/uKiZj40oC7Eutn1SvqjIX9KzmbUAfjb0rNOaMHJseO5lK222Mw== 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 D8D8516E18; Mon, 9 May 2022 19:23:13 +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 249JNDxE085897; Mon, 9 May 2022 19:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249JNDTH085896; Mon, 9 May 2022 19:23:13 GMT (envelope-from git) Date: Mon, 9 May 2022 19:23:13 GMT Message-Id: <202205091923.249JNDTH085896@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: 9940f7a7f694 - main - ntb: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9940f7a7f694f45f4d46d47ae0962027c0410efa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124194; 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=80s1Dj9bXfDv2/rrjw0bq7TwfGnTDxb3qHj/pxdn9+Y=; b=bZNi/PPeXXD8HF4ZEe5hV7Ts2y3fNcjmijrAYoLilWVTEo9SWhvnHdTUG6qfQ4B7DcG60/ EPnsOXIWNYQCshhbFus4f/NbLqEkh/IeET0GgjG0mWiB5vywHVhmY6IM+023rUlfdgqJ+c XMCMQh30Hn8lVNU+goFlvzcaS5xveAVhSI3+Yp8L2u6iItJ2vpbRYe6t6Iu6bNgrt8Qyed nH+jy6m1fmWiz7PpPUs2lmVAhMLD9Q/24/BiWkzlXlOY/VFu+cXagMUdOVuqisYuSlBnOi +2XNHGEkQOrScbETRjoSrpzn8V/hPOws7Ri0SxaiR52SzaNapojEjbVu3/D7pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652124194; a=rsa-sha256; cv=none; b=Xzf5XD0L1lYZR2neb1Uv1aMZpQ3eSEZ4Z+G6JXhyRfjetNX3n/T1v+stJKeZ/rK4PaCFcn hoo+C6LCP/zcjQzWA36XCXFhVp0nCNnoh2AkqL99+mHf/zVA0C5XYnen574P215il/bZn1 KtD+mr1wyUt7d7BFQqUS0B+hF02YxPiQYmvhGbZgbwPPaYl8AUrCulZI+jEJqsgYAxyl1l 3BY0CynQ43OqsIHeg1m8YBn6b/R8Bk5SfpijbJle8DCxyw719T/6ggUnvaWiIvKEvmGPpw Bm6pHSJ4GtkutzXaF+e7XO8fN4rFz5Fd32iDJ2VMPwl6dtjGsr9oVImNOmGvsg== 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=9940f7a7f694f45f4d46d47ae0962027c0410efa commit 9940f7a7f694f45f4d46d47ae0962027c0410efa Author: John Baldwin AuthorDate: 2022-05-09 19:22:03 +0000 Commit: John Baldwin CommitDate: 2022-05-09 19:22:03 +0000 ntb: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/ntb/if_ntb/if_ntb.c | 4 +--- sys/dev/ntb/ntb.c | 1 - sys/dev/ntb/ntb.h | 1 - sys/dev/ntb/ntb_hw/ntb_hw_amd.c | 2 +- sys/dev/ntb/ntb_hw/ntb_hw_intel.c | 2 +- sys/dev/ntb/ntb_hw/ntb_hw_plx.c | 2 +- sys/dev/ntb/ntb_transport.c | 4 +--- sys/dev/ntb/ntb_transport.h | 2 -- sys/dev/ntb/test/ntb_tool.c | 3 +-- 9 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c index 2724db4f8a06..5b592d7434f7 100644 --- a/sys/dev/ntb/if_ntb/if_ntb.c +++ b/sys/dev/ntb/if_ntb/if_ntb.c @@ -505,10 +505,8 @@ static device_method_t ntb_net_methods[] = { DEVMETHOD_END }; -devclass_t ntb_net_devclass; static DEFINE_CLASS_0(ntb, ntb_net_driver, ntb_net_methods, sizeof(struct ntb_net_ctx)); -DRIVER_MODULE(if_ntb, ntb_transport, ntb_net_driver, ntb_net_devclass, - NULL, NULL); +DRIVER_MODULE(if_ntb, ntb_transport, ntb_net_driver, NULL, NULL); MODULE_DEPEND(if_ntb, ntb_transport, 1, 1, 1); MODULE_VERSION(if_ntb, 1); diff --git a/sys/dev/ntb/ntb.c b/sys/dev/ntb/ntb.c index b765da213e2c..d9cc25a4e478 100644 --- a/sys/dev/ntb/ntb.c +++ b/sys/dev/ntb/ntb.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "ntb.h" -devclass_t ntb_hw_devclass; SYSCTL_NODE(_hw, OID_AUTO, ntb, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "NTB sysctls"); diff --git a/sys/dev/ntb/ntb.h b/sys/dev/ntb/ntb.h index 8883d52ce1ce..e27b06a7c0b5 100644 --- a/sys/dev/ntb/ntb.h +++ b/sys/dev/ntb/ntb.h @@ -31,7 +31,6 @@ #include "ntb_if.h" -extern devclass_t ntb_hw_devclass; SYSCTL_DECL(_hw_ntb); int ntb_register_device(device_t ntb); diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c index 2d13dc1321cb..94cfba2bfe72 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c @@ -1310,7 +1310,7 @@ static device_method_t ntb_amd_methods[] = { static DEFINE_CLASS_0(ntb_hw, ntb_amd_driver, ntb_amd_methods, sizeof(struct amd_ntb_softc)); -DRIVER_MODULE(ntb_hw_amd, pci, ntb_amd_driver, ntb_hw_devclass, NULL, NULL); +DRIVER_MODULE(ntb_hw_amd, pci, ntb_amd_driver, NULL, NULL); MODULE_DEPEND(ntb_hw_amd, ntb, 1, 1, 1); MODULE_VERSION(ntb_hw_amd, 1); PCI_PNP_INFO(amd_ntb_devs); diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c index 00fcc4829b9c..774bb14fea0f 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c @@ -3511,7 +3511,7 @@ static device_method_t ntb_intel_methods[] = { static DEFINE_CLASS_0(ntb_hw, ntb_intel_driver, ntb_intel_methods, sizeof(struct ntb_softc)); -DRIVER_MODULE(ntb_hw_intel, pci, ntb_intel_driver, ntb_hw_devclass, NULL, NULL); +DRIVER_MODULE(ntb_hw_intel, pci, ntb_intel_driver, NULL, NULL); MODULE_DEPEND(ntb_hw_intel, ntb, 1, 1, 1); MODULE_VERSION(ntb_hw_intel, 1); MODULE_PNP_INFO("W32:vendor/device;D:#", pci, ntb_hw_intel, pci_ids, diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c index 4231b1209291..8acf8c82a790 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c @@ -1091,6 +1091,6 @@ static device_method_t ntb_plx_methods[] = { static DEFINE_CLASS_0(ntb_hw, ntb_plx_driver, ntb_plx_methods, sizeof(struct ntb_plx_softc)); -DRIVER_MODULE(ntb_hw_plx, pci, ntb_plx_driver, ntb_hw_devclass, NULL, NULL); +DRIVER_MODULE(ntb_hw_plx, pci, ntb_plx_driver, NULL, NULL); MODULE_DEPEND(ntb_hw_plx, ntb, 1, 1, 1); MODULE_VERSION(ntb_hw_plx, 1); diff --git a/sys/dev/ntb/ntb_transport.c b/sys/dev/ntb/ntb_transport.c index 276fe604086e..b67e567a9493 100644 --- a/sys/dev/ntb/ntb_transport.c +++ b/sys/dev/ntb/ntb_transport.c @@ -1689,10 +1689,8 @@ static device_method_t ntb_transport_methods[] = { DEVMETHOD_END }; -devclass_t ntb_transport_devclass; static DEFINE_CLASS_0(ntb_transport, ntb_transport_driver, ntb_transport_methods, sizeof(struct ntb_transport_ctx)); -DRIVER_MODULE(ntb_transport, ntb_hw, ntb_transport_driver, - ntb_transport_devclass, NULL, NULL); +DRIVER_MODULE(ntb_transport, ntb_hw, ntb_transport_driver, NULL, NULL); MODULE_DEPEND(ntb_transport, ntb, 1, 1, 1); MODULE_VERSION(ntb_transport, 1); diff --git a/sys/dev/ntb/ntb_transport.h b/sys/dev/ntb/ntb_transport.h index 7695abdefaec..aade22889ac9 100644 --- a/sys/dev/ntb/ntb_transport.h +++ b/sys/dev/ntb/ntb_transport.h @@ -28,8 +28,6 @@ struct ntb_transport_qp; -extern devclass_t ntb_transport_devclass; - enum ntb_link_event { NTB_LINK_DOWN = 0, NTB_LINK_UP, diff --git a/sys/dev/ntb/test/ntb_tool.c b/sys/dev/ntb/test/ntb_tool.c index 76dfd58695ec..aae78756501f 100644 --- a/sys/dev/ntb/test/ntb_tool.c +++ b/sys/dev/ntb/test/ntb_tool.c @@ -1487,9 +1487,8 @@ static device_method_t ntb_tool_methods[] = { DEVMETHOD_END }; -devclass_t ntb_tool_devclass; static DEFINE_CLASS_0(ntb_tool, ntb_tool_driver, ntb_tool_methods, sizeof(struct tool_ctx)); -DRIVER_MODULE(ntb_tool, ntb_hw, ntb_tool_driver, ntb_tool_devclass, NULL, NULL); +DRIVER_MODULE(ntb_tool, ntb_hw, ntb_tool_driver, NULL, NULL); MODULE_DEPEND(ntb_tool, ntb, 1, 1, 1); MODULE_VERSION(ntb_tool, 1.0);