From nobody Sat Nov 14 16:03:29 2026 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 4jRf7560Kdz71KDf for ; Sat, 14 Nov 2026 16:03:29 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jRf754pmTz4Z1c for ; Sat, 14 Nov 2026 16:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794672209; 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=wx8LJU1Q+f4SsgMvkVVh+HmeGRnNKOW/cZ/VCQlR/3w=; b=hI3qIQI5z9OdR2kqiJiJYQovmPBzTVWotzvCVChvZOK8b1unb1lD9FMesTJMnAyx/bBp5L aMBEv4YTA0PZnj/ThFw6pD6+Z7nURZXPrvckJDVzCKZZV9gn/YA0uz9zX7K2GvfsLCv3Db jA991de3u8eH6doYdoflOAh5M3+2w2wk8j1iY3GqGXzgQu4jyz+qiHUrIV4D1NNUzHV4i7 p+IDsl43plIA7TEJgZdY5vVL1+2vVhSrVx3iTaJcNH0LmVOeZ30B2IDeQ3bkRHogDA4jyW tVJP/BZBooss4hsbxzQWUndZPHCV58UdOGq3X8XZhW6lR2Ws/YTvJahW31G9oA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794672209; b=hg23kLXzSd/KmJsmKt8ZkWCTtmV7Vs8rabqruc1Rjha4GzN/WQnvT3OxRNNJstuKXGzjct XZidmaCaxOOTQEJ+yuYsThhV/YIay9TsBUI8i/16Xorh9YuwBKT7e48ExXMFB04IAvp+F7 Y02NJ0B+zKZl9RzOofZqFzwNm7TWaapfOIfzArljrv1W2PMB0ZPOyYIcijYXZzRvI1s1TV R9RIc6BQMOFs07+w5EJDzYMbkCHwNCiDpiZg+zryzap3BLjQCMoGJBvHRcPgxAxgswsHzF hc/Gu51bZya9Og8qmovaUYhNhycTkP/5AMzXN2zPvrWiEuZMNdd/yCBp0H/8Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794672209; 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=wx8LJU1Q+f4SsgMvkVVh+HmeGRnNKOW/cZ/VCQlR/3w=; b=S9VaVhL6H+uP4MbmBRu0GsZR8Mcr96tHTwUZy5GP4lgeK20+DKEUncrmdN78+I5YOslNhS qjrSWPLS8yeDA7/9M8+9n331I2cT6mf3MssUANkz0a3qmHL+4Apk/Zpdyz3LQMiqTzR5Rk tpxnBSL9uc9/8Px9X6vOK7lfpXIEqH6MUtIVkYplPMPp7XX2CZ/xv/ArCNmcr6tpnW5uzc 6pxQ7mUsBw2cphTdt5+EaTJKtcFNQ+lHDVke7PwT6EdXwMenYbNcIpFueRgYtYH5URbC8z jn0D/Mylasy9t2pWOMkuPgkyVkZCFU2xIVsxnJt9mLhnonS514BDwXpx4dbn4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jRf754TMlzRgL for ; Sat, 14 Nov 2026 16:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 15ca3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 16:03:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: df10f7b7500c - main - acpi_pci_link: Remove a helper variable from _PRS parsing List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df10f7b7500c129c48a477e94039c4e0d2711b54 Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 16:03:29 +0000 Message-Id: <6af88651.15ca3.6d91f0a0@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=df10f7b7500c129c48a477e94039c4e0d2711b54 commit df10f7b7500c129c48a477e94039c4e0d2711b54 Author: John Baldwin AuthorDate: 2026-11-14 16:02:38 +0000 Commit: John Baldwin CommitDate: 2026-11-14 16:02:38 +0000 acpi_pci_link: Remove a helper variable from _PRS parsing Tested by: cperciva --- sys/dev/acpica/acpi_pci_link.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index cb6adee87252..378e4631e97d 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -275,7 +275,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) struct link *link; UINT8 *irqs = NULL; UINT32 *ext_irqs = NULL; - int i, is_ext_irq = 1; + int i; ACPI_SERIAL_ASSERT(pci_link); req = (struct link_res_request *)context; @@ -299,8 +299,6 @@ link_add_prs(ACPI_RESOURCE *res, void *context) req->in_dpf = DPF_OUTSIDE; break; case ACPI_RESOURCE_TYPE_IRQ: - is_ext_irq = 0; - /* fall through */ case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: /* * Don't parse resources if we are in a DPF set that we are @@ -325,7 +323,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) * _SRS. */ tmp = &link->l_prs_template; - if (is_ext_irq) { + if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { bcopy(res, tmp, ACPI_RS_SIZE(tmp->Data.ExtendedIrq)); /* @@ -356,7 +354,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) link->l_irqs = malloc(sizeof(int) * link->l_num_irqs, M_PCI_LINK, M_WAITOK | M_ZERO); for (i = 0; i < link->l_num_irqs; i++) { - if (is_ext_irq) { + if (ext_irqs != NULL) { link->l_irqs[i] = ext_irqs[i]; if (ext_irqs[i] >= NUM_ISA_INTERRUPTS) link->l_isa_irq = false;