From nobody Fri May 06 23:24:34 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 4D3AC1ACFE99; Fri, 6 May 2022 23:24:35 +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 4Kw68z1TSZz3Dm1; Fri, 6 May 2022 23:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879475; 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=PjiRTHQV/4Zlbh6vdiIc/mwvGnK4jZQgQNvn72A42Rs=; b=G9YN36js4ySBTQKEGr+8whboljbRTR2qJld28LMezozMumcsI7maZHeDfSe0RnhoXIlAsJ rgDqoILO+3Eybe8AwLhMAkNsR4kMmFwa6QjuW/uRVDqVAUwJNeLje8NZ+7rk2vh9tCJSNj XjpnjDUry29+OwLQaoWP4GJGGBEJroAKLDjsvcjuvIpjmgmxl90kFjETood0b0W9NVH4T8 cXjEKUVjaSRgrQRl+eKNj3esMfW/3Y8TOodXnxRDBkklhtn2Rz2e14qBqlSAcqs3FGuPoo pkxj67FBXub4GEDZDcDb9xHmJamFcqCTiMcgXvcxU7jVXN945x/Urc3rYizvtg== 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 000A6250C7; Fri, 6 May 2022 23:24:34 +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 246NOYs5074732; Fri, 6 May 2022 23:24:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246NOYYt074731; Fri, 6 May 2022 23:24:34 GMT (envelope-from git) Date: Fri, 6 May 2022 23:24:34 GMT Message-Id: <202205062324.246NOYYt074731@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: 1093caa1bb55 - main - nvme: 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: 1093caa1bb554b29a8e4178b383311b51c225cc3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879475; 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=PjiRTHQV/4Zlbh6vdiIc/mwvGnK4jZQgQNvn72A42Rs=; b=kdkuUE85xqNhD9exhBUpEmuIz+dqGiQn4pV4G+BFd32wSwLADGPi473jnhW/MizazMR2S5 k8SxThuurxXxtNOFPpCh4ATqxqeR/XvTVtP6cYi0NFeOSXKuKpbx2M+ZfvJAVKBPllpwht 2gN3Y8TuKWt5PyN5b/+eycIYQTeqte9aWamEmCWohUV3kyVz5lKwgob/y+F212A0RMT3II XLd106Uw0gJANnOgks7yHDBR88ut2+KATvQrbNM4wLmVnytmvUQwYH1KtAK0AfkTIvo4Bl ZyndpOlmeNF6QkPobN6pMfeMJA3O5ciudx7mx4+xbYlB/cpWuedIJxzcu8FmJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651879475; a=rsa-sha256; cv=none; b=XpNOMGpAHJfnnV4HO0qMFpYJXPyAG1hpkBd6BdS6QbOUWIUwePVCs0xbna4+ByMQLfbMRJ KPlrtYFXPzaTVFC7ohV1oBCX2tUYFJO8H7dcRTiIFFw/Na9eELEUlb6YY+98+XwVLSfD6m 5s6r0x9aKhSkhYL1Yiy0krb87m+HIOWT9hxjGU3zlyq9lDoCgI79QR2lH17bb9Mf2/JTVY aP7t2rRQUDfROWPnUZiou13bhmyz+NmDv8BuefZ5jXWW9k2QzCQObHluvn/xnELPh+2D5m 0g9cV6VDlPa87GtEwqOXrIpcDjGs+X7h1+qaNYlsBE6nCY3jj4p1pupiaQccJA== 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=1093caa1bb554b29a8e4178b383311b51c225cc3 commit 1093caa1bb554b29a8e4178b383311b51c225cc3 Author: John Baldwin AuthorDate: 2022-05-06 22:46:55 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:46:55 +0000 nvme: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/nvme/nvme.c | 2 -- sys/dev/nvme/nvme_ahci.c | 2 +- sys/dev/nvme/nvme_pci.c | 2 +- sys/dev/nvme/nvme_private.h | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index 15fb456a1c54..6ad010dae1b8 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -53,8 +53,6 @@ int32_t nvme_retry_count; MALLOC_DEFINE(M_NVME, "nvme", "nvme(4) memory allocations"); -devclass_t nvme_devclass; - static void nvme_init(void) { diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c index b2d5813537c3..49ee5ebe493c 100644 --- a/sys/dev/nvme/nvme_ahci.c +++ b/sys/dev/nvme/nvme_ahci.c @@ -54,7 +54,7 @@ static driver_t nvme_ahci_driver = { sizeof(struct nvme_controller), }; -DRIVER_MODULE(nvme, ahci, nvme_ahci_driver, nvme_devclass, NULL, 0); +DRIVER_MODULE(nvme, ahci, nvme_ahci_driver, NULL, NULL); static int nvme_ahci_probe (device_t device) diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index 20ffe6574dce..73d319b37c62 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -66,7 +66,7 @@ static driver_t nvme_pci_driver = { sizeof(struct nvme_controller), }; -DRIVER_MODULE(nvme, pci, nvme_pci_driver, nvme_devclass, NULL, 0); +DRIVER_MODULE(nvme, pci, nvme_pci_driver, NULL, NULL); static struct _pcsid { diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 5db5ac6a16ed..d9e64bfc7e2c 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -114,8 +114,6 @@ struct nvme_completion_poll_status { int done; }; -extern devclass_t nvme_devclass; - #define NVME_REQUEST_VADDR 1 #define NVME_REQUEST_NULL 2 /* For requests with no payload. */ #define NVME_REQUEST_UIO 3