git: 7a11a6c64d4f - main - acpi: Update mentions of s2idle in comments
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 27 May 2026 08:48:06 UTC
The branch main has been updated by obiwac:
URL: https://cgit.FreeBSD.org/src/commit/?id=7a11a6c64d4f52f41e63e535605d4187650c3651
commit 7a11a6c64d4f52f41e63e535605d4187650c3651
Author: Aymeric Wibo <obiwac@FreeBSD.org>
AuthorDate: 2026-05-27 08:47:12 +0000
Commit: Aymeric Wibo <obiwac@FreeBSD.org>
CommitDate: 2026-05-27 08:47:14 +0000
acpi: Update mentions of s2idle in comments
We use the explicit "suspend-to-idle" name now.
Sponsored by: The FreeBSD Foundation
---
sys/compat/linuxkpi/common/src/linux_acpi.c | 2 +-
sys/dev/acpi_support/acpi_ibm.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c
index 85a3afe5d01d..680d111d0194 100644
--- a/sys/compat/linuxkpi/common/src/linux_acpi.c
+++ b/sys/compat/linuxkpi/common/src/linux_acpi.c
@@ -126,7 +126,7 @@ linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype)
/*
* XXX: obiwac Not 100% sure this is correct, but
* acpi_target_sleep_state does seem to be set to
- * ACPI_STATE_S3 during s2idle on Linux.
+ * ACPI_STATE_S3 during suspend-to-idle (aka s2idle) on Linux.
*/
linux_acpi_target_sleep_state = ACPI_STATE_S3;
pm_suspend_target_state = PM_SUSPEND_TO_IDLE;
diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c
index 693d793532c1..a5c44b1f81b9 100644
--- a/sys/dev/acpi_support/acpi_ibm.c
+++ b/sys/dev/acpi_support/acpi_ibm.c
@@ -1449,8 +1449,8 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg)
switch (arg) {
/*
* XXX "Suspend-to-RAM" here is as opposed to suspend-to-disk, but it is
- * fine if our suspend sleep state transition request puts us in s2idle
- * instead of suspend-to-RAM.
+ * fine if our suspend sleep state transition request puts us in
+ * suspend-to-idle instead of actual suspend-to-RAM.
*/
case IBM_EVENT_SUSPEND_TO_RAM:
(void)power_pm_suspend(POWER_TRANSITION_SUSPEND);