From nobody Fri May 06 22:43:41 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 9876E1ABA037; Fri, 6 May 2022 22:43:43 +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 4Kw5Fn3hW5z3w09; Fri, 6 May 2022 22:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651877021; 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=RNWHiHS3TRzLiv1Pfio+IW+FUS4GdQeqBRUKuhjmWCg=; b=tNJo0jtVJcCLSzhpda4aHlJpJrbFuLt0dwAokITOBtLUgbnLe9+rwE94Paazj+1/XuqHoW IA7X2SEDS1giQlyrSKZ7q1CgBG3JosyGOgcgZonRnnfUXc7NVp2Musz7yzvf8CbzByyG9Z ZqDXY5rdyY+/LUDjkzg9EbDJGHhjMhHHJTXygIym+ERS1/9dmBcM4+CIcPsKmkhqMcUp3A R7jlvaLGDxtOdhhwYTwHcznoZFuXvrroS+WqQ4yQkFDI+BMRyGHr40GvcvAcuTGKod5vvf 28dbhYyDxR9jn1CaZlxEok9wjEhk9sy+ndp1EW9AvWxGHzvg0XdfZHGepgbeUA== 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 39DF624642; Fri, 6 May 2022 22:43:41 +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 246Mhfss020013; Fri, 6 May 2022 22:43:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246MhfAS020012; Fri, 6 May 2022 22:43:41 GMT (envelope-from git) Date: Fri, 6 May 2022 22:43:41 GMT Message-Id: <202205062243.246MhfAS020012@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: 354f6c1cc1ee - main - mfi: 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: 354f6c1cc1ee0bf109a9134f918105e63b59c8d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651877021; 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=RNWHiHS3TRzLiv1Pfio+IW+FUS4GdQeqBRUKuhjmWCg=; b=Rb0tUTepq0jC5fEr5Ba1uiX1sualw/xJKvKrOOP089oxpYIlC8dNzS9SLqbBevzBPxXlnf c5hXM1bdUwO2jJ6JHUc20u+NtZchi01oTei/lKaTxuIRWxroyp2f3eoDkEApZ/Q1lN/THY vZDEZN5IWRB9qSNdg4rZuLGjeC6W7m805LvPP7tka67FGeEP+L9yG82WNcueNBg/6QZ0/v aPWns8hBVLMIsR1iwGeggB7lho7fhn5Ma8nU9aHIUnpvDw9KZKowKTAWoyaOVJwXpj+7sZ URS3LsbmFQTl7rMkopwycIxH9xrrjUMhNdOlz2q0udMxKOKdxQsFtvXz+J4hzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651877021; a=rsa-sha256; cv=none; b=MbaIWROi/nG7fUpNwthdiIATxcye4Ijp53Ogcba2N7J4zVRr2ojsp/iZt3RrLY89WqhWZi TuxFmBvwCYMq0iZS8YnNKVaHkSpLeIVXa5xR5qRs+wKyRt48EuKPvpe7hVOH3iStF/CAH5 dJLuvPdfu/APEKilVwrPFjlPWEWhie0F6lHEUW/dDKV0ZAcvowIf3SprPkpUqm11OnSaub iRapC490bAYudLgXg/79+fTw1tM4IsUwkWCHW7m+3dGXjCxjJjCc0VkAdBf6k/j45NLEGR FkzeE5zxNIPZcwQGo7mTKkLKDGHgwm+BUvqXDsfdrTRc2PqLqw7OWbBC3/Dp0Q== 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=354f6c1cc1ee0bf109a9134f918105e63b59c8d4 commit 354f6c1cc1ee0bf109a9134f918105e63b59c8d4 Author: John Baldwin AuthorDate: 2022-04-20 16:49:22 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:39:31 +0000 mfi: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/mfi/mfi_cam.c | 5 +++-- sys/dev/mfi/mfi_disk.c | 4 +--- sys/dev/mfi/mfi_pci.c | 4 +--- sys/dev/mfi/mfi_syspd.c | 4 +--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c index fdbfaaf08250..b32f7e52068c 100644 --- a/sys/dev/mfi/mfi_cam.c +++ b/sys/dev/mfi/mfi_cam.c @@ -94,7 +94,6 @@ static int mfi_allow_disks = 0; SYSCTL_INT(_hw_mfi, OID_AUTO, allow_cam_disk_passthrough, CTLFLAG_RDTUN, &mfi_allow_disks, 0, "event message locale"); -static devclass_t mfip_devclass; static device_method_t mfip_methods[] = { DEVMETHOD(device_probe, mfip_probe), DEVMETHOD(device_attach, mfip_attach), @@ -102,12 +101,14 @@ static device_method_t mfip_methods[] = { DEVMETHOD_END }; + static driver_t mfip_driver = { "mfip", mfip_methods, sizeof(struct mfip_softc) }; -DRIVER_MODULE(mfip, mfi, mfip_driver, mfip_devclass, 0, 0); + +DRIVER_MODULE(mfip, mfi, mfip_driver, 0, 0); MODULE_DEPEND(mfip, cam, 1, 1, 1); MODULE_DEPEND(mfip, mfi, 1, 1, 1); diff --git a/sys/dev/mfi/mfi_disk.c b/sys/dev/mfi/mfi_disk.c index e1f1420d5676..277144f36ef8 100644 --- a/sys/dev/mfi/mfi_disk.c +++ b/sys/dev/mfi/mfi_disk.c @@ -68,8 +68,6 @@ static disk_close_t mfi_disk_close; static disk_strategy_t mfi_disk_strategy; static dumper_t mfi_disk_dump; -static devclass_t mfi_disk_devclass; - static device_method_t mfi_disk_methods[] = { DEVMETHOD(device_probe, mfi_disk_probe), DEVMETHOD(device_attach, mfi_disk_attach), @@ -83,7 +81,7 @@ static driver_t mfi_disk_driver = { sizeof(struct mfi_disk) }; -DRIVER_MODULE(mfid, mfi, mfi_disk_driver, mfi_disk_devclass, 0, 0); +DRIVER_MODULE(mfid, mfi, mfi_disk_driver, 0, 0); static int mfi_disk_probe(device_t dev) diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c index 90e78aeaf509..57922fc6138e 100644 --- a/sys/dev/mfi/mfi_pci.c +++ b/sys/dev/mfi/mfi_pci.c @@ -108,8 +108,6 @@ static driver_t mfi_pci_driver = { sizeof(struct mfi_softc) }; -static devclass_t mfi_devclass; - static int mfi_msi = 1; SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, &mfi_msi, 0, "Enable use of MSI interrupts"); @@ -161,7 +159,7 @@ struct mfi_ident { {0, 0, 0, 0, 0, NULL} }; -DRIVER_MODULE(mfi, pci, mfi_pci_driver, mfi_devclass, 0, 0); +DRIVER_MODULE(mfi, pci, mfi_pci_driver, 0, 0); MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice", pci, mfi, mfi_identifiers, nitems(mfi_identifiers) - 1); MODULE_VERSION(mfi, 1); diff --git a/sys/dev/mfi/mfi_syspd.c b/sys/dev/mfi/mfi_syspd.c index ba090e744ee1..542df25aea3d 100644 --- a/sys/dev/mfi/mfi_syspd.c +++ b/sys/dev/mfi/mfi_syspd.c @@ -73,8 +73,6 @@ static disk_close_t mfi_syspd_close; static disk_strategy_t mfi_syspd_strategy; static dumper_t mfi_syspd_dump; -static devclass_t mfi_syspd_devclass; - static device_method_t mfi_syspd_methods[] = { DEVMETHOD(device_probe, mfi_syspd_probe), DEVMETHOD(device_attach, mfi_syspd_attach), @@ -88,7 +86,7 @@ static driver_t mfi_syspd_driver = { sizeof(struct mfi_system_pd) }; -DRIVER_MODULE(mfisyspd, mfi, mfi_syspd_driver, mfi_syspd_devclass, 0, 0); +DRIVER_MODULE(mfisyspd, mfi, mfi_syspd_driver, 0, 0); static int mfi_syspd_probe(device_t dev)