From nobody Wed Apr 13 23:09:20 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 8C21C1B4059C; Wed, 13 Apr 2022 23:09:22 +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 4Kdyw14BdTz4ln5; Wed, 13 Apr 2022 23:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891361; 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=rksQUXk1IgfOnlk7MAE9n3H1FyugfIMRw78RDPk9cw0=; b=PpyMWJTjSsmRAmrpRckLztgXL7MwhylSsPg51YATSwj4FO3QiVK1rQ+OKoqHmG/25eNExV DjbC5Ao5Be8cmOpL7RksMEcaatX0DSX/nd2vxfEH7fdIcOLY0mZfiFDVlzyGPBSahyz4Hr FR/bzR7CF31Bp1f+CrXbvmIhJT+kBD04MXf3hAKtDK0zEp9D9vfX7Ot2PhR9h9LKCQLkQb N22ybIXDkQN+Dtch2LRtK6rAsyN+Es83lhJjPN85NQy/QmeH5zzHPL5bUgJzZABvBr0t9r 6xlbYQktslLpA+LrPfykv3wWFTMdzB5S83709wBNL0uZupehSVzuhNL4lq/Gsw== 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 E42F514F7E; Wed, 13 Apr 2022 23:09:20 +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 23DN9KIU074259; Wed, 13 Apr 2022 23:09:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9K4h074258; Wed, 13 Apr 2022 23:09:20 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:20 GMT Message-Id: <202204132309.23DN9K4h074258@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: bf264886cdc6 - main - nvdimm: Inline value of variable used once in an assertion. 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: bf264886cdc6bed7a2da88498a5f8d2ae882abb4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891361; 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=rksQUXk1IgfOnlk7MAE9n3H1FyugfIMRw78RDPk9cw0=; b=p48jCq4IJa378A9ojVDSi4vSZ5sPICcuMSOfXYMPJODbaLB66uvqLVIDnTOp7b0RhBSUl9 2x6+pHLeQh68Xccj1iKFPnFAupqWNLR7r64KkSMLkFbCeRXQ3F0UgcLqmqJ/1pDXN2kp5y nfhIe6HSD3KpFJBP0qyKTyzHTSSIglv3CGolvkuI5guwEAh+mdejmbIDJ4A6dlR4FbkgP9 kBH+KiYFcPCMQ52My9WZ6R4qZVisEteJkThEbxF5qipnT1A+LJ95d3YuJmtGD1H4eXpvKx HcCQaELtwKT6JLLzE+bnxd35D75WzsxvNNOgnwS4jhIMl/j1OPdDawWTLVPbRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891361; a=rsa-sha256; cv=none; b=ZiB85xHR/AaqXI8ZbB7yI12OuR5O8P49MosPfd5Ogjt18D4jJE10aFbOT8CRN+9U675xJZ zgfXX0Mzf23P+kk0XZmGTDnwpvs9BzABHz8G6JsME1NhjNh/l0/lQJzbWHoR1cGJQvp7kj GcukMIKENCGsk7+mGvFJT89gXl52JjOpBhHvLPv4BnzgHk9zjDU9EsWiJNxGzuN43CEUrN aoJ92wYfheDMBvM2drc0qR+K6WX411t2gOoh0yYA3TUjQjOd/i8jyDk1Hj+17omNIb83FU Qs308n8MeTCkkGUDQidKGqjrWIivJhIXMFJb9ZClxgrCOE4Yl/NuruLSu/XvLQ== 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=bf264886cdc6bed7a2da88498a5f8d2ae882abb4 commit bf264886cdc6bed7a2da88498a5f8d2ae882abb4 Author: John Baldwin AuthorDate: 2022-04-13 23:08:20 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:20 +0000 nvdimm: Inline value of variable used once in an assertion. --- sys/dev/nvdimm/nvdimm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/nvdimm/nvdimm.c b/sys/dev/nvdimm/nvdimm.c index 3dde7e3fc037..a5692fc65857 100644 --- a/sys/dev/nvdimm/nvdimm.c +++ b/sys/dev/nvdimm/nvdimm.c @@ -338,7 +338,6 @@ nvdimm_attach(device_t dev) struct sysctl_oid_list *children; struct sbuf *sb; ACPI_TABLE_NFIT *nfitbl; - ACPI_HANDLE handle; ACPI_STATUS status; ACPI_NFIT_MEMORY_MAP **maps; int error, i, num_maps; @@ -348,8 +347,7 @@ nvdimm_attach(device_t dev) ctx = device_get_sysctl_ctx(dev); oid = device_get_sysctl_tree(dev); children = SYSCTL_CHILDREN(oid); - handle = nvdimm_root_get_acpi_handle(dev); - MPASS(handle != NULL); + MPASS(nvdimm_root_get_acpi_handle(dev) != NULL); nv->nv_dev = dev; nv->nv_handle = nvdimm_root_get_device_handle(dev);