From nobody Sun Oct 2 04:29:39 2022 X-Original-To: dev-commits-src-branches@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 4Mg9wh1Yspz4dtCv; Sun, 2 Oct 2022 04:29:40 +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 4Mg9wg311Wz4521; Sun, 2 Oct 2022 04:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684979; 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=t9BzRsjlop8T1p7y9IascfhCSVG/pCL6M8b/kumC0io=; b=ZBfwZ7CXUlroXQI9Jbwk12OjfBVJgFV6binbCXPC/VNHx2n0D/trXS1ZMAxxlHwFcqAT0L /d1fdiSk0b96Q3uDYdzX8RD/H0kIc2vpbkNe5n7MarP/OIsf75hXqaY6/U9XZQRhtAe9nJ xjJChZbQDH17uY1+AXW3hViTpliXer1+3Q3SpSVY/yiQdjWMzPsYuEKkAdyTjvQ5FgWeN9 efZv4q3/mKhWwDO9aU54PRhgvjpqi1hytS6+NgNMtf+nj3rYmKhHvPwmTzihQe9bfZ2BYP YA0tnvFouJatdNM8jPF+9DpvRZMoOtTmEjI/X/eh3Kdb10C3DDteYZEnteGQ9A== 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 4Mg9wg26BczlTX; Sun, 2 Oct 2022 04:29:39 +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 2924TdXE058467; Sun, 2 Oct 2022 04:29:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924TdhF058466; Sun, 2 Oct 2022 04:29:39 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:39 GMT Message-Id: <202210020429.2924TdhF058466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c69e5d9b3ed9 - stable/13 - Mark cfg as __unused to avoid ifdef soup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c69e5d9b3ed95f34cbaaf8f822e6c288844dcb16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684979; 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=t9BzRsjlop8T1p7y9IascfhCSVG/pCL6M8b/kumC0io=; b=ZnCDAWeuIAghiapPEmWMecXxElZ0IcHrXhOOkGfSQf6J/I62/hOCdHXgGd4wl/eqVocrCH f4tkmxg6FzNliYg0y5g7Fb2eAgNyweX+V5lkl9SzIylnm9GZY6kT1a8JYGf1AI88d7nfyP bMO9bIKCDWxO/ad05snzZr/2yQUEK+iG5yeBUy6qMIQZhicU4vlzUK5gP0au3IVXBb6Mx8 YxN3hSHe3iQGSNXN+j7n9/mfzaKTDMvWJnydEfR4IR+9hVDBvvRmsAOtQLfpPM1JV29Xcv MkN79bIkDZNt1Utdne4g+5MByfcdc4Bp0d9NhQ9o4HSlQoZD/3iPKRe3o61IdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684979; a=rsa-sha256; cv=none; b=F/I9gzNVLrW5carrpd4GKXpZVSstqprVQSZtvLk1tQORCt6Rq1H3LTotJmyEghEFFnFaaC KinEMjh6uajk+kCIIr96mDuFNMFXFa/1AfjQp0ZlQnF34J9Q3oyR/I+a1XIjkbrmHlyoym /14MgVxOMU0QWdwnB5P1Xm944mg2zWi8m+jIQeSlDkBAXClBDcjPQIqnn/J3D1L9a+ijek mEiq5b/dqU/85p/Wt52Z8yu+2UNC0Krdoxw5CidS5kZq/NBbKfuw2gVl2A+Dv70ERJ2v1V DRzlOZKJ1hTJPqDBB1OugHAeARukrZT1r8j3o8dVzmHKX1pqnyKmnFXsD1Vuww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c69e5d9b3ed95f34cbaaf8f822e6c288844dcb16 commit c69e5d9b3ed95f34cbaaf8f822e6c288844dcb16 Author: Warner Losh AuthorDate: 2022-07-08 17:53:31 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:53 +0000 Mark cfg as __unused to avoid ifdef soup Sponsored by: Netflix (cherry picked from commit 09b966ee7c6389db635f793377cc50cb2fcb4962) --- sys/dev/pci/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index ca7de6c28ad5..97f6f4da1821 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -5652,7 +5652,7 @@ pci_release_resource(device_t dev, device_t child, int type, int rid, { struct pci_devinfo *dinfo; struct resource_list *rl; - pcicfgregs *cfg; + pcicfgregs *cfg __unused; if (device_get_parent(child) != dev) return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child, @@ -5662,7 +5662,7 @@ pci_release_resource(device_t dev, device_t child, int type, int rid, cfg = &dinfo->cfg; #ifdef PCI_IOV - if (dinfo->cfg.flags & PCICFG_VF) { + if (cfg->flags & PCICFG_VF) { switch (type) { /* VFs can't have I/O BARs. */ case SYS_RES_IOPORT: