From nobody Sat Nov 14 16:03:30 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 4jRf7666Kcz71KGY for ; Sat, 14 Nov 2026 16:03:30 +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 4jRf765FMpz4Z6D for ; Sat, 14 Nov 2026 16:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794672210; 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=hggcZJXvRRtTONRDN5JOa9wwyfkudLZtWl78xK8TnEA=; b=DnB12LZ8c7ODKpgaXAVtIipRPxdc3/41DavI7AKzuw9qPxjBH4NI31XgNGlbjkISG5EQuj GA8YHMhujgSCDjrPAAiZ1vX+JH7+OajndZB8DD/ch96FTbRyC6XKmab/Xdfw/U7l0rcXjP LQjmVqgpBhKdzpe+u/RdXNKUYvC137r3qGvehCm93cOka23fLpEsoDW60xod+hCgnb6DnD JL+mjrvOxY5Hc6+kWpNBKS0CKS18KxtFSdfKiGc8sREAnEngeu0JZ8wAooENDaWBETm7Fc 8J8H37cHdkrLwd3VavJ6px+pTToo8JoxfGFkoX7c6M8hIREu/D8Pa/adk5xmTA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794672210; b=QZ2oxxurmSAZ4h7OL5DEP2/ouX82+smZsbVzDDGQz7ZSQOnVj3glvXGOqkbIYMZWOqBI0V TuD99Prvr5kl6UbrPjzXuYTSYU2HcaMHAG46vf93jMIzwBkZQ8jqpAkwAtqm+xTOj+X1+F bac9yqHx3espc6QlIHx4QisFHxkAlee7NNmI2aOhkVsYEMBQD/ZtxNEWOi3dJ72kt9aSjS dmqG9oGTFDNkDhFIP1xyEkDKG1h3WfevSQg98CPZ4t3NcOpnid3f9AUkWmYWjVcrTxZvnH zMRUoRR4UC93cNqXHx257YYFnagvSLdxzlnortCoRO4+jLnzkYZyYkT4NY4I5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794672210; 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=hggcZJXvRRtTONRDN5JOa9wwyfkudLZtWl78xK8TnEA=; b=W0eq6hltj0pEmb0BNqA5tRhi01mhz+npcAjLdBEad6oLsRQTzmidsxRf6ESg8fQtMynevv KB1POQSh+LhpDfvfMIEGOdXPH7QCvVQeDr6Ryna3r8he69nrp+dzCmN8kSCl4tPM2kDfXi xjVsR/zWt1WtPGPK/tSuHlIehRZZuS0WYtb0XQcIe+M1JXQrcCe1QWB2SFmhf1vK5ewjCM iye9ZMcCVKmfnurX/ESB5pCRIFEl2UKwp7zEgG67i5WF2N5Sv2oXB1PkwT/wuu9lzjnI3H 6wahXOIIDfpnpZK77foyf/4cd9WckI2WE4axhknx8ht6U+UtJPgJ5qGM910Alg== 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 4jRf764s0VzRgM for ; Sat, 14 Nov 2026 16:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 15baf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 16:03:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6c1b6f7cf814 - main - acpi_pci_link: Factor out some duplicated code into a single copy 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: 6c1b6f7cf81447315fc0c7a294ed1467c62832bd Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 16:03:30 +0000 Message-Id: <6af88652.15baf.6fcd0894@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6c1b6f7cf81447315fc0c7a294ed1467c62832bd commit 6c1b6f7cf81447315fc0c7a294ed1467c62832bd 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: Factor out some duplicated code into a single copy Tested by: cperciva --- sys/dev/acpica/acpi_pci_link.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 378e4631e97d..b10f9614c5bc 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -356,13 +356,12 @@ link_add_prs(ACPI_RESOURCE *res, void *context) for (i = 0; i < link->l_num_irqs; i++) { if (ext_irqs != NULL) { link->l_irqs[i] = ext_irqs[i]; - if (ext_irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = false; } else { link->l_irqs[i] = irqs[i]; - if (irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = false; } + + if (link->l_irqs[i] >= NUM_ISA_INTERRUPTS) + link->l_isa_irq = false; } /*