From nobody Fri May 06 22:43:45 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 004041ABA1F5; Fri, 6 May 2022 22:43:47 +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 4Kw5Ft6LMZz3w2d; Fri, 6 May 2022 22:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651877027; 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=aNAHRg6Fz1wZBp06hVn4DUqZI0GnF1ZMEqNSDhP/bt4=; b=KAIk6COHXn6MFX3AHtSox1DD71y7KUIXoJ1zMYeGZ11oHGYI1cuP9NIzUOFYMcJG/XjpWJ aas2MuB/i7ywDLf8gFjGOp0DbGIUXkTg6zO4Bs/WsKHdRWiizxHqHEeUhOHRxOE5C/pTMy F/8QNbxmC0tjeGXu7BJo78uJEYc708E9PhxwydGiF2zVAQbndUVzqVvU0zn4b+3I8Ui1Mp LTVyCZ9XR9Iy/Og95dU8M7kiDK7g+gg+NjcOMwb2aV4w6xTnvFG3OW14WcE/MreE6z3+LM pYp8TWWTZ4cCP8eBs7/p16HCkTjlGbj4dUPaGL96y/Hdm+WZ4LT/uLcoJWjx6A== 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 C9ACE24A28; Fri, 6 May 2022 22:43:45 +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 246MhjMi020115; Fri, 6 May 2022 22:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246MhjfD020114; Fri, 6 May 2022 22:43:45 GMT (envelope-from git) Date: Fri, 6 May 2022 22:43:45 GMT Message-Id: <202205062243.246MhjfD020114@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: d48ddc5f9676 - main - mpr/mps/mpt: 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: d48ddc5f9676bbf050c5f5d110d672173ae82f47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651877027; 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=aNAHRg6Fz1wZBp06hVn4DUqZI0GnF1ZMEqNSDhP/bt4=; b=BRjFmy7rc62QtqQepT1ZsbAbY1QiGtgzfh9hmEgLPhaRAVE0t30v6dmTmkuUyzCKfSMf90 hZ5jIZeIebqc7AIZDztbOVZSUrThlGg5nwAfArXB+UwLqXe9zt5O0hckf9Lh9Ekl57uQxS iSau4Yzo+e/DThOBjJ84ojDEcXj/YgxVRNk+TIUh/jmKpHagc7rS6XrnY84nhwvJpNrrtl 0QRvcAF53bv+6rZPLJEAaF4Fjnat6o0ZDAMNQFtuDLsZX/uRLCr0CzDbObvJQYG+tyV5VO tHOl0tzlNlqZ2I4D/THvuYFS5LjTTIUdF5gPgQL6hKiRtyDlSL2xQKPpJIQ2Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651877027; a=rsa-sha256; cv=none; b=VH9eJhpq7VHpvS1p3+LP/f3AwMgbqSIKLyOXw91fj6QBAa0Lk2Qx7Y7DSe3QDVZ136QJyX yG9owO97EPtAajxJq7PHuN52r0S7X85+06jmVVEU2O4cg6eNZ5eB1pyl0rhrRdcjdQDzSn ASDs58PqOVytOoXes2D35X68rzvq7IaMbY4hAjL2cqVYfLWckuCoc4cUdBt3IO4tEl6kCE 2/Uh3BbxuTv704rdCOi/oz8uSvZzzomRogdwQOZmjPvuuWf8N9Tmh75imIZMulOSAXemUC yCq9O8VkFb74EZZJdnjK9WkdJPDJ59BusmT6g5QHLKo0wFRW5OSPw/kqb4gLZA== 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=d48ddc5f9676bbf050c5f5d110d672173ae82f47 commit d48ddc5f9676bbf050c5f5d110d672173ae82f47 Author: John Baldwin AuthorDate: 2022-04-20 17:04:01 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:39:32 +0000 mpr/mps/mpt: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/mpr/mpr_pci.c | 3 +-- sys/dev/mps/mps_pci.c | 3 +-- sys/dev/mpt/mpt_pci.c | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/dev/mpr/mpr_pci.c b/sys/dev/mpr/mpr_pci.c index c7984df6c87e..3a90a22e4cfe 100644 --- a/sys/dev/mpr/mpr_pci.c +++ b/sys/dev/mpr/mpr_pci.c @@ -174,8 +174,7 @@ struct mpr_ident { { 0, 0, 0, 0, 0, NULL } }; -static devclass_t mpr_devclass; -DRIVER_MODULE(mpr, pci, mpr_pci_driver, mpr_devclass, 0, 0); +DRIVER_MODULE(mpr, pci, mpr_pci_driver, 0, 0); MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice;D:#", pci, mpr, mpr_identifiers, nitems(mpr_identifiers) - 1); diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c index 51ca92c0b203..ea3bee6c273b 100644 --- a/sys/dev/mps/mps_pci.c +++ b/sys/dev/mps/mps_pci.c @@ -143,8 +143,7 @@ struct mps_ident { { 0, 0, 0, 0, 0, NULL } }; -static devclass_t mps_devclass; -DRIVER_MODULE(mps, pci, mps_pci_driver, mps_devclass, 0, 0); +DRIVER_MODULE(mps, pci, mps_pci_driver, 0, 0); MODULE_DEPEND(mps, cam, 1, 1, 1); MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice", pci, mps, mps_identifiers, nitems(mps_identifiers) - 1); diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c index 94c568c4c205..e9b59fc2e8a1 100644 --- a/sys/dev/mpt/mpt_pci.c +++ b/sys/dev/mpt/mpt_pci.c @@ -169,8 +169,7 @@ static driver_t mpt_driver = { "mpt", mpt_methods, sizeof(struct mpt_softc) }; -static devclass_t mpt_devclass; -DRIVER_MODULE(mpt, pci, mpt_driver, mpt_devclass, NULL, NULL); +DRIVER_MODULE(mpt, pci, mpt_driver, NULL, NULL); MODULE_DEPEND(mpt, pci, 1, 1, 1); MODULE_VERSION(mpt, 1); @@ -291,7 +290,7 @@ mpt_link_peer(struct mpt_softc *mpt) /* * XXX: depends on probe order */ - mpt2 = (struct mpt_softc *)devclass_get_softc(mpt_devclass,mpt->unit-1); + mpt2 = devclass_get_softc(device_get_devclass(mpt->dev), mpt->unit - 1); if (mpt2 == NULL) { return;