Explorar el Código

PM: Add missing "freeze" state

Fix descriptions of /sys/power/state in the documentation and in
a code comment.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
[rjw: Changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Geert Uytterhoeven hace 11 años
padre
commit
af02b5fdb1
Se han modificado 2 ficheros con 5 adiciones y 4 borrados
  1. 3 2
      Documentation/ABI/testing/sysfs-power
  2. 2 2
      kernel/power/main.c

+ 3 - 2
Documentation/ABI/testing/sysfs-power

@@ -12,8 +12,9 @@ Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
 Description:
 		The /sys/power/state file controls the system power state.
 		The /sys/power/state file controls the system power state.
 		Reading from this file returns what states are supported,
 		Reading from this file returns what states are supported,
-		which is hard-coded to 'standby' (Power-On Suspend), 'mem'
-		(Suspend-to-RAM), and 'disk' (Suspend-to-Disk).
+		which is hard-coded to 'freeze' (Low-Power Idle), 'standby'
+		(Power-On Suspend), 'mem' (Suspend-to-RAM), and 'disk'
+		(Suspend-to-Disk).
 
 
 		Writing to this file one of these strings causes the system to
 		Writing to this file one of these strings causes the system to
 		transition into that state. Please see the file
 		transition into that state. Please see the file

+ 2 - 2
kernel/power/main.c

@@ -282,8 +282,8 @@ struct kobject *power_kobj;
  *	state - control system power state.
  *	state - control system power state.
  *
  *
  *	show() returns what states are supported, which is hard-coded to
  *	show() returns what states are supported, which is hard-coded to
- *	'standby' (Power-On Suspend), 'mem' (Suspend-to-RAM), and
- *	'disk' (Suspend-to-Disk).
+ *	'freeze' (Low-Power Idle), 'standby' (Power-On Suspend),
+ *	'mem' (Suspend-to-RAM), and 'disk' (Suspend-to-Disk).
  *
  *
  *	store() accepts one of those strings, translates it into the
  *	store() accepts one of those strings, translates it into the
  *	proper enumerated value, and initiates a suspend transition.
  *	proper enumerated value, and initiates a suspend transition.