From nobody Thu Nov 19 16:05:02 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 4jVjwb4TmTz71KR4 for ; Thu, 19 Nov 2026 16:05: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVjwZ6pxtz3MCZ for ; Thu, 19 Nov 2026 16:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795104303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2BNWa+CJ7e4JzJ5guLeCrJTWXTQbuHkgg8cXTtawBvk=; b=dsZml4U9c1mZ2wk+S/+jAtXcDOPSO/ev8Wcwt4kBoM3KaYv6vtf2hvfE2kLH20CjSNctkP PslWHkWntU4qGGzwLgxH375v4M4GnUZ95NrpohYq/h5pKqyHfE5X5Py7VIHAA9cEix58s3 QVghVlsbq9Pqvoe+mLfaccL7KmuRivnH3rcBVyMq4h18ptQYaQf8D96xCmLpa8P1y5vvpc AgmF9suK8uoKYDaLWPhm4Ix+1HHki27SmNQMnWFn456QKkbxH8F58YOhZtG5+Hn0hLfg5N YuCv4dY3o3beMouPQSji4K/5z8F8gHdaRoszPrEhC62hFPiKlhRKwCIoLsneOg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795104303; b=hCSSMNhxW292XsUr0oLk/Qp+aU+zZgk7wDm0qQKoUcnpZUP4XVx1RU7iJJ5tRHCfeTqfuJ AernovzAav1RXIWMppzVlQbJrxiO+VQh6BpnTYyjqRUS8dcHO8JdGueFs4tJRjLVZUlbrK +6k1aGX9KAJhVOQ+5Ox+b9kWBrs166Zbs8idykedTugTUpKfunArSiv8D+DUXbdnn1XY2u KqWVl8Fq7DXCeXE9RmcrWHjZhRKCV+0+stdyZcESFjB6QW595OobViO3ZYnH4oY0I1nPzw e72a1M79TuGCEV8sdm02c3JaMHbAD5ILhAQVSBldVtc2FRupWu7Egy6WW86/Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795104303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2BNWa+CJ7e4JzJ5guLeCrJTWXTQbuHkgg8cXTtawBvk=; b=wr11X09I7Dd1Vlgycnz5DGdR1S6XTLnHrUcjDCqi0UvRo43hBe300bRR+paimIm/I86unC IdvcpEGBtWN4irn2E0wsGQ1RWv4X9aTpeXLtW1qFBS2tNzz3XXn5fOlPe9KjjLOcC43GTB TNNBozhl/6DRLW7hsEMEVREp+aEErpxX8JTZq3nx4fDAfPcgorkeJpZYo+vJp8pUGMs1T4 y7FwInQoRQeGSo/tB6kbpzfAIjTyfUHepHfCZGm1RVMhOG5m1GcBJxJQQxewupUB4iaqf5 a+oi6I6izRtv1ZTJ821UTKhutrC5ahjaiv0LMdS+s6ms8VgDfsVjJ9xGaoZtyw== 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 4jVjwZ6QkVz16wQ for ; Thu, 19 Nov 2026 16:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id edb1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 16:05:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Colin Percival Subject: git: 2f98fd7fe800 - releng/15.2 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 2f98fd7fe8007db0793997d32c5ffa41317d6469 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 16:05:02 +0000 Message-Id: <6aff1e2e.edb1.71abcf80@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2f98fd7fe8007db0793997d32c5ffa41317d6469 commit 2f98fd7fe8007db0793997d32c5ffa41317d6469 Author: John Baldwin AuthorDate: 2026-11-14 16:02:38 +0000 Commit: Colin Percival CommitDate: 2026-11-19 16:04:39 +0000 acpi_pci_link: Remove a helper variable from _PRS parsing Approved by: re (cperciva) Tested by: cperciva (cherry picked from commit df10f7b7500c129c48a477e94039c4e0d2711b54) (cherry picked from commit 0af24d1fe82f1161cab8f10ba7f23cc3bee7dc11) --- 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;