From nobody Tue Feb 17 20:46:17 2026 X-Original-To: dev-commits-src-main@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 4fFsB16HzXz6S3kY for ; Tue, 17 Feb 2026 20:46:17 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFsB149J5z3vHq for ; Tue, 17 Feb 2026 20:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361177; 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=JDqxyBdXUcTqIuZ5rbVbURTKrdxUEFANVxdwbbWPmrQ=; b=iXs7+aWUi7Gg7WCDeOqdRCuFykaJdS3pHERbIGlOrpbDhiDeM2hLh7g0MysRfSk/v6u6v5 Q5LzTc67j7r5XjxQQkT0t333W+RkJIFUwR0Q5/IGY0c6lV7SQpuqT2qBFwpg1t3zPmVPTh An/obIX2e3tuBoxu3okOuzTGqQO5A2O2DOjnbxTgtbhK8WQlSkv1kTkClW7vMd3z+Ty2XP 5QlHvbCQn8y6ac1kBGPrOeoUUWa3E1c7FXsh3hY2woncKS9l/ixRQdJzl1nXd3H0MaMNVy WN/EY14rwGdycW/uE3eBZL7fT1BDDqNi2gu/vvJQe01GzPFCstapq1qJ1IEjSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361177; a=rsa-sha256; cv=none; b=LTbHYnWEJ2hCLhlzB6CwOp0TeVveOaajL2q8RBPGJIhxsjpBDGPgmYv5d1THE1q6lPDlk1 jKSyZszsCaQXwGN70Z8v4ELYavF/r365PtAaoqJl7A1GZF3JeUlQKK3Z7oLySWURrdF1TA 64RStqxNRNKirs0zYsXCiHN9MbAcmMCnyGuSIA3wmS0donBx4BtVxddOWGabIbrydQqaGd YCFRTW51LW406DwkqZmQRVGOK9sWuQvEL101vb1l4GVe+sEl1+Ig8U6KXjb6JDlu7W1UXj Z5ytgkP62sBg9GT2CeKJzifaJ9pS3baYaxJv8OVyxLeUixfQPZ7+ZzLN7CIU8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361177; 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=JDqxyBdXUcTqIuZ5rbVbURTKrdxUEFANVxdwbbWPmrQ=; b=Kok8zBJh804ABn4J23yS1ANG22UehncxQYDshaGqtaTd/IjkhCf/GBanklrAq5AtW6xJML apjNNeTBKjKy2j72JdKwIa4PFluBokOAP8JAiVstu8F/gcOL/oZN3I4+QTRxGP7jXWR7Z4 8zXzApqI5ANazhwh9qGJk7f47Gj19iWgr1PMdTu35CAyjcUz8rFXZ0j/sghHZNIlkV2oxW MrbZefDv9Yrh+QsiMRZ1yqgfGGEn2orP0qBniFasRu1IrcwC1clE1u+Jla3M84Up/WB7fp jtztOf7BxK3yCx/yKStheoL/tsetlftBiPcB0FZa5ZKNJlfCattzZVBV/8bZuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB12xXWz9B5 for ; Tue, 17 Feb 2026 20:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f209 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:46:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b9f1e45e685b - main - acpi_gpiobus: Reuse the existing IVAR index for an ACPI handle List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b9f1e45e685b5e007d0c3a9513ac13e6d82e9518 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:46:17 +0000 Message-Id: <6994d399.1f209.71bd704a@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f1e45e685b5e007d0c3a9513ac13e6d82e9518 commit b9f1e45e685b5e007d0c3a9513ac13e6d82e9518 Author: John Baldwin AuthorDate: 2026-02-17 20:44:58 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:44:58 +0000 acpi_gpiobus: Reuse the existing IVAR index for an ACPI handle ACPI_IVAR_HANDLE is a global index shared across multiple busses, there is no need for a unique constant here. Reviewed by: vexeduxr, imp Differential Revision: https://reviews.freebsd.org/D54155 --- sys/dev/gpio/acpi_gpiobus.c | 2 +- sys/dev/gpio/acpi_gpiobusvar.h | 13 ------------- sys/dev/gpio/gpioaei.c | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 0c31f4fec16d..117c05799c08 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -401,7 +401,7 @@ acpi_gpiobus_read_ivar(device_t dev, device_t child, int which, struct acpi_gpiobus_ivar *devi = device_get_ivars(child); switch (which) { - case ACPI_GPIOBUS_IVAR_HANDLE: + case ACPI_IVAR_HANDLE: *result = (uintptr_t)devi->handle; break; default: diff --git a/sys/dev/gpio/acpi_gpiobusvar.h b/sys/dev/gpio/acpi_gpiobusvar.h index 288e8bd0f2af..ea4e7d44a217 100644 --- a/sys/dev/gpio/acpi_gpiobusvar.h +++ b/sys/dev/gpio/acpi_gpiobusvar.h @@ -28,21 +28,8 @@ #ifndef __ACPI_GPIOBUS_H__ #define __ACPI_GPIOBUS_H__ -#include - #include -enum acpi_gpiobus_ivars { - ACPI_GPIOBUS_IVAR_HANDLE = 10600 -}; - -#define ACPI_GPIOBUS_ACCESSOR(var, ivar, type) \ - __BUS_ACCESSOR(acpi_gpiobus, var, ACPI_GPIOBUS, ivar, type) - -ACPI_GPIOBUS_ACCESSOR(handle, HANDLE, ACPI_HANDLE) - -#undef ACPI_GPIOBUS_ACCESSOR - uint32_t acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *); #endif /* __ACPI_GPIOBUS_H__ */ diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c index 9a769a793e5a..3451d3120843 100644 --- a/sys/dev/gpio/gpioaei.c +++ b/sys/dev/gpio/gpioaei.c @@ -208,7 +208,7 @@ gpio_aei_attach(device_t dev) /* This is us. */ device_set_desc(dev, "ACPI Event Information Device"); - handle = acpi_gpiobus_get_handle(dev); + handle = acpi_get_handle(dev); status = AcpiGetParent(handle, &sc->dev_handle); if (ACPI_FAILURE(status)) { device_printf(dev, "Cannot get parent of %s\n",