From nobody Wed Jun 17 03:08:23 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 4gg81z53JWz6jFLX for ; Wed, 17 Jun 2026 03:08:23 +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 4gg81z2tNpz3VTH for ; Wed, 17 Jun 2026 03:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781665703; 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=IHgcg9u7cMqZnAREORGfRoUmXqiCFA6bARXVttgNUvQ=; b=KQkzbVj5GaP5XhUk3M2kB3kx6NbKJu8vgNeUHyrfFhhrqqUnrkuHotZGSGaRchMvdNIjpe dxc02wJtnEFJ5ge29zywZ/+xwkT1Jq3bPVl3aBmeRkbzNS1ALFDsGtHvBt4IX+QVdWcoIg wcbfM7TEhFkMNwolKXMWHiSk/6xyYSTao2MR/Q4MOi2C1xMqhr/A90bXuetmlqVl0b3Dhb MoR9WlYRdhD7G69Fq7M9PowoX1vPQ861ZrfFFU+VZfQUkxyLxiNJzi4cZVBZJM7gy/GsMZ 7dBryGkYJZAGGENKMliMdtMYtfi26qK+9Aqn3SmM3z4f/0gk3Ic8YHE9suMn3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781665703; a=rsa-sha256; cv=none; b=NCtVsCd0WWtWk/kydurhJZFD4UW05YoXHjsVrTgELytvUSfgdX6V8rSshB5Z7M6ZhdqsQu LVOUnr0o1bu6oaP7vzwtwNiHaSbWEVd6mY27h1NMG+QYeTqUrgpYhdczjxsmOT2mIRltcB dasgR8KoThkHPQc1BMhX+w77dmMPdX0WXoe9L9iBNxFlRRDnQkiBK25VHWiTIB6qU3rVlF /nnhQHrZm4OmZZB8ZmhR4WC2oYM7BaJJ6bdnJjI8aH/u/2Dy0KOuKArHr5UR0wP+iMDHul dglVLBY7olJRzkn4k1tv3pGq3feChmU+Pkxt7i2fj0rO6x7LnrS3FZnqPreRLQ== 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=1781665703; 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=IHgcg9u7cMqZnAREORGfRoUmXqiCFA6bARXVttgNUvQ=; b=XIml1CidWa8pwNLF8sUYHcOZEaR4xtOeaYxZN4yc03lLiIasOAwBEaNSDRhByh7U2YHkUg dAm9mS6kEu89EkXLtKPM0mLMY4UiTSsxckU7IaEb/FB0RhfTc54NEL4OdCH6GMouShVLgK CR6wB9drXWRa5r9LTJN4ndhis+h616HGAuDBMmIDZTJ4cdBzcBp6vBqH7j7UteV6NTM3nz N3fLCgvbAm0oEz2ijWuBUfMkkjenSrz0sGSz2p62ZiHjHQaaIGUxGjHWURMZI6ehqwAIRk Va4PgKjtYEPai8PgxjNYIqmCwVjZDiQvJymP/Yu3d2KM/sF8432969pIPJ59bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gg81z2T6YztwS for ; Wed, 17 Jun 2026 03:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39b7c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Jun 2026 03:08:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 554a459ff599 - main - acpi: Constify acpi_stype_to_sstate() and some users 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 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: 554a459ff59969e0f66b1b1c6695d249e2eecd84 Auto-Submitted: auto-generated Date: Wed, 17 Jun 2026 03:08:23 +0000 Message-Id: <6a320fa7.39b7c.5887a2d5@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=554a459ff59969e0f66b1b1c6695d249e2eecd84 commit 554a459ff59969e0f66b1b1c6695d249e2eecd84 Author: Olivier Certner AuthorDate: 2026-06-17 03:03:20 +0000 Commit: Olivier Certner CommitDate: 2026-06-17 03:06:22 +0000 acpi: Constify acpi_stype_to_sstate() and some users Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57413 --- sys/dev/acpica/acpi.c | 14 ++++++++------ sys/kern/subr_power.c | 2 +- sys/sys/power.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 75cb99d2cdfe..9a85a0844de6 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -197,7 +197,8 @@ static int acpi_suspend_state_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_sleep_state_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_stype_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_debug_objects_sysctl(SYSCTL_HANDLER_ARGS); -static int acpi_stype_to_sstate(struct acpi_softc *sc, enum power_stype stype); +static int acpi_stype_to_sstate(const struct acpi_softc *const sc, + const enum power_stype stype); static int acpi_pm_func(u_long cmd, void *arg, enum power_stype stype); static void acpi_enable_pcie(void); static void acpi_reset_interfaces(device_t dev); @@ -808,7 +809,8 @@ acpi_attach(device_t dev) } static int -acpi_stype_to_sstate(struct acpi_softc *sc, enum power_stype stype) +acpi_stype_to_sstate(const struct acpi_softc *const sc, + const enum power_stype stype) { switch (stype) { case POWER_STYPE_AWAKE: @@ -2160,7 +2162,7 @@ acpi_device_pwr_for_sleep_sxd(device_t dev, ACPI_HANDLE handle, int state, int acpi_device_pwr_for_sleep(device_t bus, device_t dev, int *dstate) { - struct acpi_softc *sc = device_get_softc(bus); + const struct acpi_softc *const sc = device_get_softc(bus); ACPI_HANDLE handle = acpi_get_handle(dev); int state; @@ -3846,7 +3848,7 @@ acpi_wake_set_enable(device_t dev, int enable) } static int -acpi_wake_sleep_prep(struct acpi_softc *sc, ACPI_HANDLE handle, +acpi_wake_sleep_prep(struct acpi_softc *const sc, ACPI_HANDLE handle, enum power_stype stype) { int sstate; @@ -3884,7 +3886,7 @@ acpi_wake_sleep_prep(struct acpi_softc *sc, ACPI_HANDLE handle, } static int -acpi_wake_run_prep(struct acpi_softc *sc, ACPI_HANDLE handle, +acpi_wake_run_prep(struct acpi_softc *const sc, ACPI_HANDLE handle, enum power_stype stype) { int sstate; @@ -4557,7 +4559,7 @@ acpi_supported_sleep_state_sysctl(SYSCTL_HANDLER_ARGS) static int acpi_suspend_state_sysctl(SYSCTL_HANDLER_ARGS) { - struct acpi_softc *const sc = oidp->oid_arg1; + const struct acpi_softc *const sc = oidp->oid_arg1; const enum power_stype old_stype = power_suspend_stype; enum power_stype new_stype; int old_sstate = acpi_stype_to_sstate(sc, old_stype); diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 1cfa6e5c77dd..5c1f6283caff 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -191,7 +191,7 @@ power_pm_deferred_fn(void *arg, int pending) int power_pm_register(u_int pm_type, power_pm_fn_t pm_fn, void *pm_arg, - bool pm_supported[static POWER_STYPE_COUNT]) + const bool pm_supported[static POWER_STYPE_COUNT]) { int error; diff --git a/sys/sys/power.h b/sys/sys/power.h index b2d49781d359..c9439d89db20 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -107,7 +107,7 @@ extern const char *power_stype_to_name(enum power_stype _stype); typedef int (*power_pm_fn_t)(u_long _cmd, void* _arg, enum power_stype _stype); extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, void *_pm_arg, - bool _pm_supported[static POWER_STYPE_COUNT]); + const bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); extern int power_pm_suspend(enum power_transition _trans);