git: 6f451c60918f - main - power: Rename power transition enum

The branch main has been updated by obiwac:

URL: https://cgit.FreeBSD.org/src/commit/?id=6f451c60918f2152ebe89f561f04e5219cecffa6

commit 6f451c60918f2152ebe89f561f04e5219cecffa6
Author:     Aymeric Wibo <obiwac@FreeBSD.org>
AuthorDate: 2026-05-12 09:46:19 +0000
Commit:     Aymeric Wibo <obiwac@FreeBSD.org>
CommitDate: 2026-05-12 09:46:24 +0000

    power: Rename power transition enum
    
    Just so it isn't so long.  Changing now before the API freezes, after
    discussion with olce@.
    
    While here, improve the wording in the comments for power transitions
    and sleep types a bit.
    
    Reviewed by:    olce
    Approved by:    olce
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D56953
---
 sys/dev/acpi_support/acpi_ibm.c |  2 +-
 sys/dev/syscons/syscons.c       |  4 ++--
 sys/dev/vt/vt_core.c            |  4 ++--
 sys/kern/subr_power.c           |  8 ++++----
 sys/sys/power.h                 | 19 ++++++++++---------
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c
index 1221384e7d8a..2967832a0878 100644
--- a/sys/dev/acpi_support/acpi_ibm.c
+++ b/sys/dev/acpi_support/acpi_ibm.c
@@ -1453,7 +1453,7 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg)
 	 * instead of suspend-to-RAM.
 	 */
 	case IBM_EVENT_SUSPEND_TO_RAM:
-		power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND);
+		power_pm_suspend(POWER_TRANSITION_SUSPEND);
 		break;
 
 	case IBM_EVENT_BLUETOOTH:
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 1a2969d6f2d8..fe440b68f209 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -3987,10 +3987,10 @@ next_code:
 				break;
 
 			case SUSP:
-				power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND);
+				power_pm_suspend(POWER_TRANSITION_SUSPEND);
 				break;
 			case STBY:
-				power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY);
+				power_pm_suspend(POWER_TRANSITION_STANDBY);
 				break;
 
 			case DBG:
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index f7cffcea5b92..68e9f45cff56 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -804,11 +804,11 @@ vt_machine_kbdevent(struct vt_device *vd, int c)
 		return (1);
 	case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */
 		/* Put machine into Stand-By mode. */
-		power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY);
+		power_pm_suspend(POWER_TRANSITION_STANDBY);
 		return (1);
 	case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */
 		/* Suspend machine. */
-		power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND);
+		power_pm_suspend(POWER_TRANSITION_SUSPEND);
 		return (1);
 	}
 
diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c
index 761c9c0639ce..47682a0ee75e 100644
--- a/sys/kern/subr_power.c
+++ b/sys/kern/subr_power.c
@@ -176,7 +176,7 @@ power_pm_get_type(void)
 }
 
 void
-power_pm_suspend(enum power_sstate_transition trans)
+power_pm_suspend(enum power_transition trans)
 {
 	enum power_stype	stype;
 
@@ -184,13 +184,13 @@ power_pm_suspend(enum power_sstate_transition trans)
 		return;
 
 	switch (trans) {
-	case POWER_SSTATE_TRANSITION_STANDBY:
+	case POWER_TRANSITION_STANDBY:
 		stype = power_standby_stype;
 		break;
-	case POWER_SSTATE_TRANSITION_SUSPEND:
+	case POWER_TRANSITION_SUSPEND:
 		stype = power_suspend_stype;
 		break;
-	case POWER_SSTATE_TRANSITION_HIBERNATE:
+	case POWER_TRANSITION_HIBERNATE:
 		stype = power_hibernate_stype;
 		break;
 	default:
diff --git a/sys/sys/power.h b/sys/sys/power.h
index 85e0b12391ff..e420717e1aa7 100644
--- a/sys/sys/power.h
+++ b/sys/sys/power.h
@@ -48,21 +48,22 @@
  * Sleep state transition requests.
  *
  * These are high-level sleep states that the system can enter.  They map to
- * a specific generic sleep type (enum power_stype).
+ * a specific generic sleep type (enum power_stype), depending on the
+ * kern.power.* sysctls.
  */
-enum power_sstate_transition {
-	POWER_SSTATE_TRANSITION_STANDBY,
-	POWER_SSTATE_TRANSITION_SUSPEND,
-	POWER_SSTATE_TRANSITION_HIBERNATE,
+enum power_transition {
+	POWER_TRANSITION_STANDBY,
+	POWER_TRANSITION_SUSPEND,
+	POWER_TRANSITION_HIBERNATE,
 };
 
 /*
  * Sleep type.
  *
  * These are the specific generic methods of entering a sleep state.  E.g.
- * POWER_SSTATE_TRANSITION_SUSPEND could be set to enter either suspend-to-RAM
- * (which is S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI systems).
- * This would be done through the kern.power.suspend sysctl.
+ * POWER_TRANSITION_SUSPEND could be set to enter either firmware suspend (which
+ * is suspend-to-RAM or S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI
+ * platforms).  This would be done through the kern.power.suspend sysctl.
  */
 enum power_stype {
 	POWER_STYPE_AWAKE,
@@ -96,7 +97,7 @@ 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]);
 extern u_int	 power_pm_get_type(void);
-extern void	 power_pm_suspend(enum power_sstate_transition _trans);
+extern void	 power_pm_suspend(enum power_transition _trans);
 
 /*
  * System power API.