From nobody Fri Apr 24 15:29:12 2026 X-Original-To: dev-commits-src-branches@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 4g2H1h5NLMz6bSGX for ; Fri, 24 Apr 2026 15:29:12 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H1h2hh1z3D6k for ; Fri, 24 Apr 2026 15:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044552; 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=y6S6wMxKLpB93ynkhl7vs43jv3hoi92rj9/aa5TMDOI=; b=woe5exUGcPvcZimcagpswuyWVuQoH9Z2xr2YEdi3Ze4B5SiegQA7nKG2LC5OxKbG8UaZ1J iWH8dlA9UwbAKG9EA4VsFsztb3LuKnHViiqEwW3tWua/iB1BqRcnMEEaAu7hkFRH/TROpJ Glz+IsnEnEG33br6jvUyxMel4SHRY8c1Qdc1GUnK6FawYyLQ56b12hBeiqp6Fak6jJBOjL yIlGlzs9VjA3SI9ZonjXw1xSD0Jfn9ZJlD3cDshNkqca5kCfEhKoGavG9no91pSBwHgZXW vJ30rW5wDMixMpE+RCMn9w20mwNnEaH49zk691KRA0YYCFfbyXwGFOhBfPNjCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044552; a=rsa-sha256; cv=none; b=Om92rOmajsbIh3YSlkYyt+bIYJkcKYZbHEBCNg2Ssn2TrydA45+/x2XFkG4Ju5Q9ZVGOaG 2Rdv+9iCc0vdoaq9N+EUMqpFpJ9F/0dO0YN0WYTUijB/1JXhMDsDdcJR9mZSzTimAwqrrb YkzMPhzHNIlKMUD5zhsXkXoW1yMgEJK3H0Cm/vfxgWaVM4vb8Z54mFUqbBBL22DtkejBxo Q+dQ9zwYpsQtlNS7zCVk2taDNaSIDIJVG2ouXIbRf8QBw6IeupmKWFSJBNyYiVXZEdcMhG h1eeXHeOmebaWJTXSjpyRaaeubGN76AAxWjnS98m2cqd8BvLOWv4CjnLKd7WwA== 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=1777044552; 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=y6S6wMxKLpB93ynkhl7vs43jv3hoi92rj9/aa5TMDOI=; b=csyOdSUhYyvlM3eI0+fsIWIVaV2G8r6PiHG7bIHK/re4WS4XCGw8YeMZmHmdlmQXOmGDD/ QEwYeLVJbCiPXbiQ1grFAWuedFeQLyxe2XdPQ1gytPPhkUStFaI0nDSTOaSduizMeCWF8t +O8PQRX9B0SALHJNp+isuU8myvUWVdHW2SvJ79bg0KhhVDdvlSneeoapC2MYgvb1G4xMCY 2w8+KzcCHlnqobPimPbxOJLw+/dmubySytdIwcsZzU/78aanEBXc6Pm7NHuUac9aputphj 2Rvbv2GtS+SJZype2KKogekD6C+HVd5AEvQhAnsfv8DD1JHp5pIQ5BHEY5aOXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1h2GZSz178X for ; Fri, 24 Apr 2026 15:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ff90e613e783 - stable/15 - acpi: Add a function to deregister all ioctl commands using the same function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: ff90e613e7836fb5a8bfef26758c07b4f1d3eb67 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:12 +0000 Message-Id: <69eb8c48.33b57.61b6966c@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ff90e613e7836fb5a8bfef26758c07b4f1d3eb67 commit ff90e613e7836fb5a8bfef26758c07b4f1d3eb67 Author: John Baldwin AuthorDate: 2026-01-15 18:24:08 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:38 +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 (cherry picked from commit 5bd84c4f0d016a2ca87ee115370ec1e7802e6d8a) --- 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 7db4c776b00b..3951d817f0e3 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4148,6 +4148,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_ */