diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-26 07:40:47 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-26 07:40:47 -0400 |
commit | 27ddcc6596e50cb8f03d2e83248897667811d8f6 (patch) | |
tree | 59ea73e4c3999bcb8519cdc1d5cfd695a3c019ea /kernel/power/power.h | |
parent | f71495f3f0c5f0801823d1235b271a4a415d3df8 (diff) |
PM / sleep: Add state field to pm_states[] entries
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>
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 15f37ea08719..99539c5da844 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h | |||
@@ -178,8 +178,13 @@ extern void swsusp_show_speed(struct timeval *, struct timeval *, | |||
178 | unsigned int, char *); | 178 | unsigned int, char *); |
179 | 179 | ||
180 | #ifdef CONFIG_SUSPEND | 180 | #ifdef CONFIG_SUSPEND |
181 | struct pm_sleep_state { | ||
182 | const char *label; | ||
183 | suspend_state_t state; | ||
184 | }; | ||
185 | |||
181 | /* kernel/power/suspend.c */ | 186 | /* kernel/power/suspend.c */ |
182 | extern const char *const pm_states[]; | 187 | extern struct pm_sleep_state pm_states[]; |
183 | 188 | ||
184 | extern bool valid_state(suspend_state_t state); | 189 | extern bool valid_state(suspend_state_t state); |
185 | extern int suspend_devices_and_enter(suspend_state_t state); | 190 | extern int suspend_devices_and_enter(suspend_state_t state); |