From nobody Fri May 06 22:42:56 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 2E2F61AB7EEB; Fri, 6 May 2022 22:42:57 +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 4Kw5Dw61jZz3vPd; Fri, 6 May 2022 22:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876976; 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=MYNazdlockPq1BN7s6Y0e1vVGLhjBVPr0HeSEYI3kJY=; b=eYyrB1gbUXMvOvgheoBi/l0J1DfP5PbojEApKWEfYoD56mTXAGb+MIwBpcWE53zNN2skiv Pu4GnMV0ahR4/ne/+Mjfm87StABYsnx2x+enMm4LNQZU8M3TsuirO8/yer0/LPyg/CYfVf vjKHOSzeRLHZXCE83nGR2vvzKr3YjOV7TTQtJe1okZx8JzZgy55aMfd+WlRK3fmRyMBATB w1O1zLRn5SkJvng1CkqbhJDJGzCRd5AcjcEp/KcbCalY+f3ct8+MFfNWGdlKrao7rV9wWt SlPCbdoCyd4kAmXT2oP5P8J0Rdk2BBXHtHzYGRXvx73AkZL2iO6RE4KM2eMWOA== 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 9DCEF24B05; Fri, 6 May 2022 22:42:56 +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 246MguL8019029; Fri, 6 May 2022 22:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246Mgubl019028; Fri, 6 May 2022 22:42:56 GMT (envelope-from git) Date: Fri, 6 May 2022 22:42:56 GMT Message-Id: <202205062242.246Mgubl019028@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: 23802d41faf1 - main - Remove unused ahci_devclass. 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: 23802d41faf1786bcf759bc2fa5dcaf8bf56f05d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876976; 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=MYNazdlockPq1BN7s6Y0e1vVGLhjBVPr0HeSEYI3kJY=; b=r0g4o/WiP6zYWsiqfIsFSN9GHGpCikxvArWtUiPFPWCHwTvZfQOf+uT3OauYGs/PIRymIW h6h25BgiGWxnv53Z/WSeKwC0EeGv8PTqtJjYTLMQmcS5QrjXH0JWL1ypU/w5O1eanHPFZd uaI+qYv+tnwOTkh/8y9OLUbIbrcG+P7H1A3bzuhdiZ/dHDR/GreJzku+wNk7Husgk2VMvN myczlrdB2S1AtAbPKNrjftvhNo+AtPeKNX93gVweamjQmQX/Um0cSGTV3qF6C625/4nlQS tlB7NpzugHvFU3/YD4vvCzoY6aGydvQ8LznkZXjkSKbbImQIvaU1pEVIdQmsHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651876976; a=rsa-sha256; cv=none; b=VZfZLfMLpkYt0Ele3mCHThw4QdGa+lc7XpraAZTl9JezqLnoTZSzeI9atnysYK22D4jLTK zK0rNl7o8pByBxCvAMj1r6VnQaB4koaDeQUZd3yEzj8H535cy9uZiUGOWtqS/qmUl2UYkY aFaf0oIAHiUg8CpAcF25+GFmwgbG03xwUaZaQ8VKID/gcwTAwpwyjxeBmWWQadry2oS1M8 CxyJRDtRDhs8NuC3U84frJGrrwXRQ0AcpUXN/XaZ2lGK5oMYPgsIVP4OlfkBjViE2Pnu+X LqOG/Z4hzQYKcZ3pOZ48CvZdh7MehoFjRbCiRGFqMffkYFtLPxYxsKw5rI1uKA== 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=23802d41faf1786bcf759bc2fa5dcaf8bf56f05d commit 23802d41faf1786bcf759bc2fa5dcaf8bf56f05d Author: John Baldwin AuthorDate: 2022-04-26 18:04:15 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:39:28 +0000 Remove unused ahci_devclass. --- sys/arm/allwinner/a10_ahci.c | 2 +- sys/arm/freescale/imx/imx6_ahci.c | 2 +- sys/arm/nvidia/tegra_ahci.c | 3 +-- sys/dev/ahci/ahci.c | 2 -- sys/dev/ahci/ahci.h | 2 -- sys/dev/ahci/ahci_mv_fdt.c | 4 ++-- sys/dev/ahci/ahci_pci.c | 9 +++++++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c index 5e6f53291394..ac35a033f76c 100644 --- a/sys/arm/allwinner/a10_ahci.c +++ b/sys/arm/allwinner/a10_ahci.c @@ -423,4 +423,4 @@ static driver_t ahci_ata_driver = { sizeof(struct ahci_a10_softc) }; -DRIVER_MODULE(a10_ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0); +DRIVER_MODULE(a10_ahci, simplebus, ahci_ata_driver, 0, 0); diff --git a/sys/arm/freescale/imx/imx6_ahci.c b/sys/arm/freescale/imx/imx6_ahci.c index 457966d9b219..9a789049b984 100644 --- a/sys/arm/freescale/imx/imx6_ahci.c +++ b/sys/arm/freescale/imx/imx6_ahci.c @@ -358,6 +358,6 @@ static driver_t ahci_ata_driver = { sizeof(struct ahci_controller) }; -DRIVER_MODULE(imx6_ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0); +DRIVER_MODULE(imx6_ahci, simplebus, ahci_ata_driver, 0, 0); MODULE_DEPEND(imx6_ahci, ahci, 1, 1, 1); SIMPLEBUS_PNP_INFO(compat_data) diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c index d3d6d55fdc56..17da6a08f6d5 100644 --- a/sys/arm/nvidia/tegra_ahci.c +++ b/sys/arm/nvidia/tegra_ahci.c @@ -780,5 +780,4 @@ static device_method_t tegra_ahci_methods[] = { static DEFINE_CLASS_0(ahci, tegra_ahci_driver, tegra_ahci_methods, sizeof(struct tegra_ahci_sc)); -DRIVER_MODULE(tegra_ahci, simplebus, tegra_ahci_driver, ahci_devclass, - NULL, NULL); +DRIVER_MODULE(tegra_ahci, simplebus, tegra_ahci_driver, NULL, NULL); diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index d62a043eb2ab..5f91b088b4bc 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -2906,7 +2906,5 @@ ahcipoll(struct cam_sim *sim) } } -devclass_t ahci_devclass; - MODULE_VERSION(ahci, 1); MODULE_DEPEND(ahci, cam, 1, 1, 1); diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h index f1d5b18806b3..ae068d11ce4b 100644 --- a/sys/dev/ahci/ahci.h +++ b/sys/dev/ahci/ahci.h @@ -674,5 +674,3 @@ void ahci_attached(device_t dev, struct ahci_channel *ch); void ahci_detached(device_t dev, struct ahci_channel *ch); struct ahci_channel * ahci_getch(device_t dev, int n); void ahci_putch(struct ahci_channel *ch); - -extern devclass_t ahci_devclass; diff --git a/sys/dev/ahci/ahci_mv_fdt.c b/sys/dev/ahci/ahci_mv_fdt.c index ee08093482c5..4b9c0068dda8 100644 --- a/sys/dev/ahci/ahci_mv_fdt.c +++ b/sys/dev/ahci/ahci_mv_fdt.c @@ -151,5 +151,5 @@ static driver_t ahci_driver = { sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci_mv, simplebus, ahci_driver, ahci_devclass, NULL, NULL); -DRIVER_MODULE(ahci_mv, ofwbus, ahci_driver, ahci_devclass, NULL, NULL); +DRIVER_MODULE(ahci_mv, simplebus, ahci_driver, NULL, NULL); +DRIVER_MODULE(ahci_mv, ofwbus, ahci_driver, NULL, NULL); diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 5f8663b96609..15dbfe95ee3e 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -746,15 +746,18 @@ static device_method_t ahci_methods[] = { DEVMETHOD(bus_get_dma_tag, ahci_get_dma_tag), DEVMETHOD_END }; + static driver_t ahci_driver = { "ahci", ahci_methods, sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci, pci, ahci_driver, ahci_devclass, NULL, NULL); + +DRIVER_MODULE(ahci, pci, ahci_driver, NULL, NULL); /* Also matches class / subclass / progid XXX need to add when we have masking support */ MODULE_PNP_INFO("W32:vendor/device", pci, ahci, ahci_ids, nitems(ahci_ids) - 1); + static device_method_t ahci_ata_methods[] = { DEVMETHOD(device_probe, ahci_ata_probe), DEVMETHOD(device_attach, ahci_pci_attach), @@ -769,9 +772,11 @@ static device_method_t ahci_ata_methods[] = { DEVMETHOD(bus_child_location, ahci_child_location), DEVMETHOD_END }; + static driver_t ahci_ata_driver = { "ahci", ahci_ata_methods, sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci, atapci, ahci_ata_driver, ahci_devclass, NULL, NULL); + +DRIVER_MODULE(ahci, atapci, ahci_ata_driver, NULL, NULL);