| Message ID | 1394536091-28881-1-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 03/11/2014 04:38 PM, Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Regards, Srivatsa S. Bhat > --- > v2: > - Update comments for state_show() as suggested by Srivatsa S. Bhat > <srivatsa.bhat@linux.vnet.ibm.com> > > 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 <rjw@rjwysocki.net> > 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-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue 2014-03-11 12:08:11, Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Acked-by: Pavel Machek <pavel@ucw.cz> Is it going to go in through the trivial tree? Thanks, Pavel
Hi Pavel, On Tue, Mar 11, 2014 at 1:40 PM, Pavel Machek <pavel@ucw.cz> wrote: > On Tue 2014-03-11 12:08:11, Geert Uytterhoeven wrote: >> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> >> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Acked-by: Pavel Machek <pavel@ucw.cz> Thanks! > Is it going to go in through the trivial tree? I didn't send this to trivial, so please take it through the PM tree. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday, March 11, 2014 02:13:59 PM Geert Uytterhoeven wrote: > Hi Pavel, > > On Tue, Mar 11, 2014 at 1:40 PM, Pavel Machek <pavel@ucw.cz> wrote: > > On Tue 2014-03-11 12:08:11, Geert Uytterhoeven wrote: > >> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > >> > >> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > > > Acked-by: Pavel Machek <pavel@ucw.cz> > > Thanks! > > > Is it going to go in through the trivial tree? > > I didn't send this to trivial, so please take it through the PM tree. Queued up for 3.15 along with the other two commens cleanups in the runtime PM and hibernation code. Thanks!
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 <rjw@rjwysocki.net> 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.