From nobody Mon Jun 22 21:42:41 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 4gkhWQ3P2Sz6j5hf for ; Mon, 22 Jun 2026 21:42:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkhWQ0wcdz3M8N for ; Mon, 22 Jun 2026 21:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782164562; 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=MRvexUgETSyOCrMbqCNAS4cVOeX6kaAunXkPkbFEqKw=; b=R5GjJudH/K+BVi/Gff8hZv2vbKY7CpVsx4dsDKAnWmQjyhEjzZo3GnBjDSlBEecd8lCF1Y tsJupsooMAt93qv6mfWDd0Ii2ETazyMCgqAabIxbsHuozkB8Sl4herkxFj5+WEjoPt0OGb 0AnzSNgmJcVEOsdkCobnFdC3/82CXkHceTd42yFfuwNmr/qFIb4dgO5OuithkQfZwJUIvH DaHUL88xYLRsN2tXSj11j60nZq81Luukz8hZIoe6iyfIsITJzqJHP3xy/ljh7DZWbQqkkF eRdP97XyqcDj+nKp2i8KQ0x2w5dQsWXFly0u2y5RrSsaxvTX7hxgi7KrtDnyjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782164562; a=rsa-sha256; cv=none; b=CRE6ofqfyfAdx6ZdOUtZETpASKALWD7ytliMsB5F4FZB2zmtaSxSNR+XNrOZSIHvvjkiU/ Xk9uJRYZTgyJkzKo/swTmOBJi2MwFsMEdUGClSALe+GGvTYR5zWSJ1qxzj6/9cieLxCMki EGXRLLPtodyks8+MsXt/lGDSe1vrETpNBXWd7GpAUHlTOYq16x/I/Ry6q4T08ycp68tF84 NRBHPh49O+qjcVAdhhKhrZv6pPL2WZ7NFn7ZlWV4VZnYuX8QmmiKeYDIrPC9spSXsyjuzC LhNW6uMjmtUEPdAaSmWJZOhN3m7sB305xMY6kQAKm6m8pIexyWjOmR80d/rPvQ== 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=1782164562; 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=MRvexUgETSyOCrMbqCNAS4cVOeX6kaAunXkPkbFEqKw=; b=nM2Ak9iIGNCyKUQXG2bUKbJMIicYEePQ9Q77qPYi3AxEbltNM/F6aAuznrR+TiKl2eEKcb t3FEImvRcNBWzp5F+LIjchG2AHWvttOrgi6nnX0PpsuRTACgc0yKdpLSL0YQmmUgEutiFd 54DsPDSi3rv6sNqRcDe5DIMfL4pZF//Bn5YfNC09ZdjhEYZgw8+1O6TFIhOMTWmuOwEtDk PuVEp4a5eD5Sq8TGIp8A3LfBVZN8kQHOl/6EXztb9eo0l/B49wOn7Df4C7bQBdaCK5IqyX 4fEaQ4yKadlWkL5kV2mtdUoEKlzLXXZgQT4kmWVTwcWc2IRwBhmCMF9Cy0t+zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkhWP6yB2z14kT for ; Mon, 22 Jun 2026 21:42:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f930 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 21:42:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 5ca875f3be03 - main - acpi: Export handler invoke helpers, use them in acpi_lid 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 List-Id: 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ca875f3be030eb8ac80d8fb1b8f8018dc5eeb09 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 21:42:41 +0000 Message-Id: <6a39ac51.1f930.30193577@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5ca875f3be030eb8ac80d8fb1b8f8018dc5eeb09 commit 5ca875f3be030eb8ac80d8fb1b8f8018dc5eeb09 Author: Olivier Certner AuthorDate: 2026-06-04 10:55:45 +0000 Commit: Olivier Certner CommitDate: 2026-06-22 21:40:14 +0000 acpi: Export handler invoke helpers, use them in acpi_lid Removes duplicated code. No functional change (intended). Reviewed by: obiwac Event: Halifax Hackathon 202606 Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/OlCe2/freebsd-src/pull/8 --- sys/dev/acpica/acpi.c | 4 ++-- sys/dev/acpica/acpi_lid.c | 4 ++-- sys/dev/acpica/acpivar.h | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 1e21d4572fac..b689e936916b 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4142,13 +4142,13 @@ acpi_system_eventhandler_wakeup(struct acpi_softc *const sc, /* * ACPICA Event Handlers (FixedEvent, also called from button notify handler) */ -static void +void acpi_invoke_sleep_eventhandler(const enum power_stype *const stype) { EVENTHANDLER_INVOKE(acpi_sleep_event, *stype); } -static void +void acpi_invoke_wake_eventhandler(const enum power_stype *const stype) { EVENTHANDLER_INVOKE(acpi_wakeup_event, *stype); diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c index fb8755d9f0fe..1d5249a19731 100644 --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -235,9 +235,9 @@ acpi_lid_notify_status_changed(void *arg) sc->lid_status ? "opened" : "closed"); if (sc->lid_status == 0) - EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_stype); + acpi_invoke_sleep_eventhandler(&acpi_sc->acpi_lid_switch_stype); else - EVENTHANDLER_INVOKE(acpi_wakeup_event, acpi_sc->acpi_lid_switch_stype); + acpi_invoke_wake_eventhandler(&acpi_sc->acpi_lid_switch_stype); out: ACPI_SERIAL_END(lid); diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index aa30e5fef26e..9facbaea595a 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -475,6 +475,9 @@ EVENTHANDLER_DECLARE(acpi_video_event, acpi_event_handler_t); EVENTHANDLER_DECLARE(acpi_post_dev_suspend, acpi_event_handler_t); EVENTHANDLER_DECLARE(acpi_pre_dev_resume, acpi_event_handler_t); +void acpi_invoke_sleep_eventhandler(const enum power_stype *stype); +void acpi_invoke_wake_eventhandler(const enum power_stype *stype); + /* Device power control. */ ACPI_STATUS acpi_pwr_wake_enable(ACPI_HANDLE consumer, int enable); ACPI_STATUS acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state);