From nobody Fri May 6 22:42:57 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 6F5591AB81CF; Fri, 6 May 2022 22:42:58 +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 4Kw5Dy1DF1z3vRM; Fri, 6 May 2022 22:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876978; 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=bVh+sQwu97FVMDCFbe5B/gx90MV7i7FY+6gstCxs3RY=; b=aoGmwpvHY0zpYA2w+0T5fPyZymnYfzwgD6QdjNBGGAZyuj9oJzFZa0ExsR4oPaFCWNlUsE wCpBoKiis9TKMWUNZdAr7euR1xBBZlW4YDD7lF8fFM6A1r2qV4xtp8jHhFidh22vDjihly c6xT25v0zzKSXnlcX24CmnU6pqNUMwm29k4/VVJUwuCIE21n2VpjPPNux+A0LNkW91SBpl kBKCqQt58sjO7nrNxskcqLCRSoKwPDkdsYQWC1dmGFp7kOyxoeQ9U1CHobteasrQl6/oLR GAFTglRERBOJolmul18RGLKZL6HEOBbEJyc1UGQ9GkWtzuY99sKspzlwczq5SQ== 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 C0E2924924; Fri, 6 May 2022 22:42:57 +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 246MgvkV019053; Fri, 6 May 2022 22:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246Mgv7l019052; Fri, 6 May 2022 22:42:57 GMT (envelope-from git) Date: Fri, 6 May 2022 22:42:57 GMT Message-Id: <202205062242.246Mgv7l019052@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: 07c15a9d3556 - main - ahci: 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: 07c15a9d35565d3862a7b3f02596b2e18e721f76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876978; 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=bVh+sQwu97FVMDCFbe5B/gx90MV7i7FY+6gstCxs3RY=; b=iZUn2O9gPxF2sMWrdRqRur7/hsc7I+zgY/hpMOE4APKakQLff1Ln3+eW575OLq9bucKnxa /1DOGmQUq/xqzfYsZjzJMVGYAPibAMVbT8QYwDWHJjCoM4NPJx4I6A+lnwEqYEm4iU4lh5 jtlU3T108NkXr13/oWlUhpFWcpb/Mo5X/baGU19RPj/UtNhbFra9Djp3aN5bnP1dtOAict QuiJQDSciwDq0kLr52GgjpLi3Sa/GuC6LfjaJSZlW67aC4zklo+XlcdMXoO5xHOPh2UdSt lwV55dBMfa4d2EbMy4fWmsGs1rxYa+bxlabk7poJzyvHXYQhTdz39ziFzX4ocQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651876978; a=rsa-sha256; cv=none; b=slm25QzUwcFE8AdMqVjYFS4cMlUd4k+Fgrhb/MW1FigXptLoO75ammTlcHjxYsdNkVAnI8 VHpiWBpzDg98y7omz6Aw9d12M9hp7AAjuHQu71k8rAFv4GNdkz7j6D7L7U+yKurBYQULuy fxD+IgN5cP0WTfdWgFk1k+KF1t9hSQ6dsQVEFT8zPnUUKzA/FkfD556UfC9kcscT49Kxil cphbDsKjYyi/yVErxjGr5DRxA5VyJHg1kFUfVlqDFcxYI8wDvin0pBdVAmmfTzDVuD6/qP 9vSC9kc1okSJHTh/8RYXOswtxJT7e2wAbkc3XMr6u8muzdZqXbO8fZCfjVfb7w== 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=07c15a9d35565d3862a7b3f02596b2e18e721f76 commit 07c15a9d35565d3862a7b3f02596b2e18e721f76 Author: John Baldwin AuthorDate: 2022-04-19 20:39:53 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:39:28 +0000 ahci: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/ahci/ahci.c | 3 +-- sys/dev/ahci/ahci_fsl_fdt.c | 7 ++----- sys/dev/ahci/ahci_generic.c | 8 ++------ sys/dev/ahci/ahciem.c | 3 +-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index 5f91b088b4bc..3fd119b2e10e 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -1056,7 +1056,6 @@ ahci_ch_resume(device_t dev) return (0); } -devclass_t ahcich_devclass; static device_method_t ahcich_methods[] = { DEVMETHOD(device_probe, ahci_ch_probe), DEVMETHOD(device_attach, ahci_ch_attach), @@ -1070,7 +1069,7 @@ static driver_t ahcich_driver = { ahcich_methods, sizeof(struct ahci_channel) }; -DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahcich_devclass, NULL, NULL); +DRIVER_MODULE(ahcich, ahci, ahcich_driver, NULL, NULL); struct ahci_dc_cb_args { bus_addr_t maddr; diff --git a/sys/dev/ahci/ahci_fsl_fdt.c b/sys/dev/ahci/ahci_fsl_fdt.c index 0fda9c28294b..b2caf24a5f45 100644 --- a/sys/dev/ahci/ahci_fsl_fdt.c +++ b/sys/dev/ahci/ahci_fsl_fdt.c @@ -417,8 +417,5 @@ static driver_t ahci_fsl_fdt_driver = { sizeof(struct ahci_fsl_fdt_controller), }; -static devclass_t ahci_fsl_fdt_devclass; -DRIVER_MODULE(ahci_fsl, simplebus, ahci_fsl_fdt_driver, ahci_fsl_fdt_devclass, - NULL, NULL); -DRIVER_MODULE(ahci_fsl, ofwbus, ahci_fsl_fdt_driver, ahci_fsl_fdt_devclass, - NULL, NULL); +DRIVER_MODULE(ahci_fsl, simplebus, ahci_fsl_fdt_driver, NULL, NULL); +DRIVER_MODULE(ahci_fsl, ofwbus, ahci_fsl_fdt_driver, NULL, NULL); diff --git a/sys/dev/ahci/ahci_generic.c b/sys/dev/ahci/ahci_generic.c index 108aaa2adf3a..ab571f0313b6 100644 --- a/sys/dev/ahci/ahci_generic.c +++ b/sys/dev/ahci/ahci_generic.c @@ -172,7 +172,6 @@ ahci_gen_detach(device_t dev) } #ifdef FDT -static devclass_t ahci_gen_fdt_devclass; static device_method_t ahci_fdt_methods[] = { DEVMETHOD(device_probe, ahci_fdt_probe), DEVMETHOD(device_attach, ahci_gen_attach), @@ -191,12 +190,10 @@ static driver_t ahci_fdt_driver = { ahci_fdt_methods, sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci_fdt, simplebus, ahci_fdt_driver, ahci_gen_fdt_devclass, - NULL, NULL); +DRIVER_MODULE(ahci_fdt, simplebus, ahci_fdt_driver, NULL, NULL); #endif #ifdef DEV_ACPI -static devclass_t ahci_gen_acpi_devclass; static device_method_t ahci_acpi_methods[] = { DEVMETHOD(device_probe, ahci_acpi_probe), DEVMETHOD(device_attach, ahci_gen_attach), @@ -215,6 +212,5 @@ static driver_t ahci_acpi_driver = { ahci_acpi_methods, sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci_acpi, acpi, ahci_acpi_driver, ahci_gen_acpi_devclass, - NULL, NULL); +DRIVER_MODULE(ahci_acpi, acpi, ahci_acpi_driver, NULL, NULL); #endif diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c index 20b36830ce9a..de4b5ba9000e 100644 --- a/sys/dev/ahci/ahciem.c +++ b/sys/dev/ahci/ahciem.c @@ -274,7 +274,6 @@ ahci_em_resume(device_t dev) return (0); } -devclass_t ahciem_devclass; static device_method_t ahciem_methods[] = { DEVMETHOD(device_probe, ahci_em_probe), DEVMETHOD(device_attach, ahci_em_attach), @@ -288,7 +287,7 @@ static driver_t ahciem_driver = { ahciem_methods, sizeof(struct ahci_enclosure) }; -DRIVER_MODULE(ahciem, ahci, ahciem_driver, ahciem_devclass, NULL, NULL); +DRIVER_MODULE(ahciem, ahci, ahciem_driver, NULL, NULL); static void ahci_em_setleds(device_t dev, int c)