From nobody Sat Jun 20 17:48:03 2026 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 4gjMPb6yNxz6hDvv for ; Sat, 20 Jun 2026 17:48:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gjMPb6DtMz3Yjc for ; Sat, 20 Jun 2026 17:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781977683; 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=P6/xL9bXZrky6uvtT22J6uwGCLFZgAYOKFTi723rkA4=; b=K+rDAId3aQje9oRBxVoJPWLiu8AcYUeXy/9DXxxgDFvaWJ6qU13Rfeq/+QBNzsp06luz9V wNpoQuIlxEgcEjQ3EcDfeQotQwAxybQSWRHA0i1lyop3+9eCLhDGIvaxfviKDTnmkxr4ZV gVXXzvL57zJQFYMVcO+zljt7VknOpAdS95QAkJGDO+DV6z3groEqn+tpBGWUx7yIAYPm7S 54g+sIMMdjyD/sp83gQuE1I5dM2crhj5itz3hQKBuoU/ryqXcHhF589rxcbYaiCdw9iwHt pU5z+KM7vkjKRwZoKj6aOCPQqG3bkxBZBPrWnyQtE5AWghG6NqsNmxnw+ZDSbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781977683; a=rsa-sha256; cv=none; b=tr+ylPBM+EBe5xPZROv/1EE5p7UDmoQRX0JQRi1NkJuP7DURRjSJgXfy17AT88VGxF03Gf o1hfNEiGlQkS1/BUnvct7pABN8DAHqLM0PUt+yiMpRX4iXmxS3ueav84HEuKdsDhZaV2OT 9MYXfP2c+1DLwBsyxSAsUJ80PryWOkdEZtP+p/4j8iyFu8YNIOfRB7UeEq4MdX4TX3+cHT uchHu6tJCnir0yR11OBFCL0GYCCMevnb1yvhL4Wq/VGR9Hi7ma91ZD3Ivm468NF0B0fs9l +cWWsAncpAbjbIzGz2x48h2KYeBMCIKO5IDWKIYyS99jbFj2gVWV/d3+9I50mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781977683; 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=P6/xL9bXZrky6uvtT22J6uwGCLFZgAYOKFTi723rkA4=; b=mjvDTXS1+WV3qul+Ea+mWK2SchgP/mjqIoUab3F89edeM8Eh/7jx8o/cv7tts4jiFADIgF izwNvG/E1oce1QhBUO3gF+6UCdd50hIlFL5DBiNNlryxw+KvNZiMRN2noatL/rM5vC2Qf+ /CTqmrjH0mp2rPWwkgLBPF1yTw++Fh7wBBO85aDRkEJTh/voPmnEZd4CKhsAhUC9s9WuYr tlLFIcTiAFVN5So+VoQwl8S9KVplIwwq2u8355Rh9ma3jD09arxMv4PR/PbfTdMVGAKRqd FGjUSJXoGt8iQvtE6GLcN3op6qdaWUMbJGDcMDKHCxfT1Lp31O7VG5hfJp8+Xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjMPb4dPkzghv for ; Sat, 20 Jun 2026 17:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23333 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Jun 2026 17:48:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 64b805d52eec - main - nvme: Move default is_storage method to nvme_private.h 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64b805d52eec795c6436def24cec508404b5bfdc Auto-Submitted: auto-generated Date: Sat, 20 Jun 2026 17:48:03 +0000 Message-Id: <6a36d253.23333.4a7b848@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=64b805d52eec795c6436def24cec508404b5bfdc commit 64b805d52eec795c6436def24cec508404b5bfdc Author: Warner Losh AuthorDate: 2026-06-20 17:44:27 +0000 Commit: Warner Losh CommitDate: 2026-06-20 17:46:37 +0000 nvme: Move default is_storage method to nvme_private.h Since CODE entries wind up in the nvme_if.c file, we got warnings when it wasn't used (which is always). Move it into nvme_private and change its name to nvme_is_storage_default to put it into the nvme_ namespace. Fixes: 949804c81909 Sponsored by: Netflix --- sys/dev/nvme/nvme_if.m | 10 +--------- sys/dev/nvme/nvme_private.h | 6 ++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_if.m b/sys/dev/nvme/nvme_if.m index 9705aeb7ce0b..4484c1da9dce 100644 --- a/sys/dev/nvme/nvme_if.m +++ b/sys/dev/nvme/nvme_if.m @@ -12,14 +12,6 @@ HEADER { #include "dev/nvme/nvme_private.h" }; -CODE { - static bool - default_is_storage_device(device_t dev) - { - return (true); - } -} - # # A new namespace is now available # @@ -67,4 +59,4 @@ METHOD int handle_aen { # METHOD bool is_storage_device { device_t dev; -} default default_is_storage_device; +} default nvme_is_storage_device_default; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index f5918a04be72..ec941f31779c 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -591,4 +591,10 @@ void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); int nvme_ctrlr_resume(struct nvme_controller *ctrlr); +static inline bool +nvme_is_storage_device_default(device_t dev) +{ + return (true); +} + #endif /* __NVME_PRIVATE_H__ */