diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:29:24 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-17 23:36:10 +0100 |
| commit | 93e1ee43a72b11e1b50aab87046c131a836a4456 (patch) | |
| tree | 86897d0bec41d2040f371d2bf2951f1f35bf727d /kernel/power/power.h | |
| parent | PM / Sleep: Unify kerneldoc comments in kernel/power/suspend.c (diff) | |
| download | linux-93e1ee43a72b11e1b50aab87046c131a836a4456.tar.xz linux-93e1ee43a72b11e1b50aab87046c131a836a4456.zip | |
PM / Sleep: Make enter_state() in kernel/power/suspend.c static
The enter_state() function in kernel/power/suspend.c should be
static and state_store() in kernel/power/suspend.c should call
pm_suspend() instead of it, so make that happen (which also reduces
code duplication related to suspend statistics).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 398d42b48e9e..98f3622d7407 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -177,13 +177,11 @@ extern const char *const pm_states[]; extern bool valid_state(suspend_state_t state); extern int suspend_devices_and_enter(suspend_state_t state); -extern int enter_state(suspend_state_t state); #else /* !CONFIG_SUSPEND */ static inline int suspend_devices_and_enter(suspend_state_t state) { return -ENOSYS; } -static inline int enter_state(suspend_state_t state) { return -ENOSYS; } static inline bool valid_state(suspend_state_t state) { return false; } #endif /* !CONFIG_SUSPEND */ |