From nobody Thu Jan 15 18:24:26 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 4dsWbb2bcGz6PGky for ; Thu, 15 Jan 2026 18:24:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsWbb036Yz3nXM for ; Thu, 15 Jan 2026 18:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768501467; 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=3h+qqCyCmeiV9/VucX7KhsclITKJAfhlQBbWSwvppF4=; b=vbwwE6Lxk+lW/EhXXnxTVpP3b62ts/TUi02+Jvw6UThdn7rgQ0YTh4FZMaWd5KhbHMCJeG 2JOkkdBkzeV/gALDdaC2sKq7c5SFlYoniJ/4nUjIjvniK1Szxc7uOwRijEo6frNibtZI0z D/WS9mocG3mncT3ahYBTpu/7EC+pryS29mBzj8Eewg5zACH2qHRce3wOy6YGfsNk6pjKe7 xC+mENV6UCyzDUDRl83T8bSPV0J90ZBmHXMv0maw4fA5V1cSk6usunwkw40BbWwjKoTK6U 39o4WD+sLK1Bt8yYQg2+0jIdG9J31R4cjuam3UhDNj6utEETU2GVcLr/gCIffA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768501467; 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=3h+qqCyCmeiV9/VucX7KhsclITKJAfhlQBbWSwvppF4=; b=s4/6lNVJ+pX29+rMd4BizkHzELK5jWAfcPEYpxhz9KEgUOIB+BK4HTNK/th9XNfEvqNmhy xq3W/caxLs+pdZGa6jdYcl+m2+QPttMKbmCwyNqbx/9mjxdXiiyU3vQ0qbwToYaIeiw0Hg O4Kbt9IKZ+DUNjRoZBU9hg+PODZ+DxiGHmGT+yFNGkv0pDV4Wal/esom0CGfDzYUpIp411 crzNc3iKOne4ind/2blSpvi6r0PpUrseRxB6Il1zEiZan2/wJIIlYVi/upnK9aEUNdocSh 9PVwrv4UYpK6CXXrrMO2mYfSKGwgmJtb9EDO/F6+Y2rDrQU/GGf2zHw28K0vGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768501467; a=rsa-sha256; cv=none; b=tzUmZk8tRAJfIcceu3e9a+Zw/ltbu3S3BLzyfx4XMk/5rLvBUFU/pS1/obBtTN77pfaXCh gXuflwLgny+VqD1XmBpFzSEB9HJ2CNbMSaGdtfESj8+BUq1qr0ORvrgPPjmppKqlCL+C3A mJ4mPWsGF92/yaTEG8nNE7pgJBasX1I5Liv21ssufWJ7S5DxIxr9RafM0upSdB5XDD65Fx 1ipKbVMAD6v7KYOLu1viTrJFYSuJk7HFCB8E7RQNEUePx/LWQKv4Pycea9sL8zeFUNE9ax R+bBaUEvzabzIk6LtfGFH2L45WXh+TRdrZ9JGEzpli8OkyNhctISMmYiY8JLKg== 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 4dsWbZ6gDwzffk for ; Thu, 15 Jan 2026 18:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dd5e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 18:24:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5bd84c4f0d01 - main - acpi: Add a function to deregister all ioctl commands using the same function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 5bd84c4f0d016a2ca87ee115370ec1e7802e6d8a Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 18:24:26 +0000 Message-Id: <696930da.3dd5e.6c0a5920@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5bd84c4f0d016a2ca87ee115370ec1e7802e6d8a commit 5bd84c4f0d016a2ca87ee115370ec1e7802e6d8a Author: John Baldwin AuthorDate: 2026-01-15 18:24:08 +0000 Commit: John Baldwin CommitDate: 2026-01-15 18:24:08 +0000 acpi: Add a function to deregister all ioctl commands using the same function This simplifies detach/cleanup for drivers that add multiple ACPI ioctls. Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54420 --- sys/dev/acpica/acpi.c | 15 +++++++++++++++ sys/dev/acpica/acpi_battery.c | 8 +------- sys/dev/acpica/acpiio.h | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 9657938371f0..518cbce19e33 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4334,6 +4334,21 @@ acpi_deregister_ioctl(u_long cmd, acpi_ioctl_fn fn) ACPI_UNLOCK(acpi); } +void +acpi_deregister_ioctls(acpi_ioctl_fn fn) +{ + struct acpi_ioctl_hook *hp, *thp; + + ACPI_LOCK(acpi); + TAILQ_FOREACH_SAFE(hp, &acpi_ioctl_hooks, link, thp) { + if (hp->fn == fn) { + TAILQ_REMOVE(&acpi_ioctl_hooks, hp, link); + free(hp, M_ACPIDEV); + } + } + ACPI_UNLOCK(acpi); +} + static int acpiopen(struct cdev *dev, int flag, int fmt, struct thread *td) { diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c index cfd8261d5eab..f1eebda705c1 100644 --- a/sys/dev/acpica/acpi_battery.c +++ b/sys/dev/acpica/acpi_battery.c @@ -531,13 +531,7 @@ acpi_battery_init(void) out: if (error) { - acpi_deregister_ioctl(ACPIIO_BATT_GET_UNITS, acpi_battery_ioctl); - acpi_deregister_ioctl(ACPIIO_BATT_GET_BATTINFO, acpi_battery_ioctl); - acpi_deregister_ioctl(ACPIIO_BATT_GET_BATTINFO_V1, acpi_battery_ioctl); - acpi_deregister_ioctl(ACPIIO_BATT_GET_BIF, acpi_battery_ioctl); - acpi_deregister_ioctl(ACPIIO_BATT_GET_BIX, acpi_battery_ioctl); - acpi_deregister_ioctl(ACPIIO_BATT_GET_BST, acpi_battery_ioctl); - acpi_deregister_ioctl(ACPIIO_BATT_GET_BST_V1, acpi_battery_ioctl); + acpi_deregister_ioctls(acpi_battery_ioctl); } return (error); } diff --git a/sys/dev/acpica/acpiio.h b/sys/dev/acpica/acpiio.h index 63779d309951..4df049ed196a 100644 --- a/sys/dev/acpica/acpiio.h +++ b/sys/dev/acpica/acpiio.h @@ -205,6 +205,7 @@ union acpi_battery_ioctl_arg { typedef int (*acpi_ioctl_fn)(u_long cmd, caddr_t addr, void *arg); extern int acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg); extern void acpi_deregister_ioctl(u_long cmd, acpi_ioctl_fn fn); +extern void acpi_deregister_ioctls(acpi_ioctl_fn fn); #endif #endif /* !_ACPIIO_H_ */