diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-26 13:40:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:54:15 -0700 |
| commit | e89547b87ae44b464fef54572d29c0cd32cb9caa (patch) | |
| tree | 265017471708b5bf4f95279b8b653fd06d6ca919 /kernel/power/power.h | |
| parent | a1b7f13b63e431c141715ecc183d92409982ed63 (diff) | |
| download | linux-3.10-e89547b87ae44b464fef54572d29c0cd32cb9caa.tar.gz linux-3.10-e89547b87ae44b464fef54572d29c0cd32cb9caa.tar.bz2 linux-3.10-e89547b87ae44b464fef54572d29c0cd32cb9caa.zip | |
PM / sleep: Add state field to pm_states[] entries
commit 27ddcc6596e50cb8f03d2e83248897667811d8f6 upstream.
To allow sleep states corresponding to the "mem", "standby" and
"freeze" lables to be different from the pm_states[] indexes of
those strings, introduce struct pm_sleep_state, consisting of
a string label and a state number, and turn pm_states[] into an
array of objects of that type.
This modification should not lead to any functional changes.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 7d4b7ffb3c1..10d907516b2 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -175,8 +175,13 @@ extern void swsusp_show_speed(struct timeval *, struct timeval *, unsigned int, char *); #ifdef CONFIG_SUSPEND +struct pm_sleep_state { + const char *label; + suspend_state_t state; +}; + /* kernel/power/suspend.c */ -extern const char *const pm_states[]; +extern struct pm_sleep_state pm_states[]; extern bool valid_state(suspend_state_t state); extern int suspend_devices_and_enter(suspend_state_t state); |