On 03/11/2014 04:38 PM, Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <[email protected]> > > Signed-off-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Srivatsa S. Bhat <[email protected]> Regards, Srivatsa S. Bhat > --- > v2: > - Update comments for state_show() as suggested by Srivatsa S. Bhat > <[email protected]> > > Documentation/ABI/testing/sysfs-power | 5 +++-- > kernel/power/main.c | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/Documentation/ABI/testing/sysfs-power > b/Documentation/ABI/testing/sysfs-power > index 205a73878441..64c9276e9421 100644 > --- a/Documentation/ABI/testing/sysfs-power > +++ b/Documentation/ABI/testing/sysfs-power > @@ -12,8 +12,9 @@ Contact: Rafael J. Wysocki <[email protected]> > Description: > The /sys/power/state file controls the system power state. > 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 > transition into that state. Please see the file > diff --git a/kernel/power/main.c b/kernel/power/main.c > index 1d1bf630e6e9..6271bc4073ef 100644 > --- a/kernel/power/main.c > +++ b/kernel/power/main.c > @@ -282,8 +282,8 @@ struct kobject *power_kobj; > * state - control system power state. > * > * 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 > * proper enumerated value, and initiates a suspend transition. > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
