diff options
| -rw-r--r-- | drivers/acpi/sleep.c | 15 | ||||
| -rw-r--r-- | drivers/acpi/sleep.h | 2 |
2 files changed, 0 insertions, 17 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 7f251dd1a687..24a830b39ec3 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -806,21 +806,6 @@ static void acpi_sleep_hibernate_setup(void) | |||
| 806 | static inline void acpi_sleep_hibernate_setup(void) {} | 806 | static inline void acpi_sleep_hibernate_setup(void) {} |
| 807 | #endif /* !CONFIG_HIBERNATION */ | 807 | #endif /* !CONFIG_HIBERNATION */ |
| 808 | 808 | ||
| 809 | int acpi_suspend(u32 acpi_state) | ||
| 810 | { | ||
| 811 | suspend_state_t states[] = { | ||
| 812 | [1] = PM_SUSPEND_STANDBY, | ||
| 813 | [3] = PM_SUSPEND_MEM, | ||
| 814 | [5] = PM_SUSPEND_MAX | ||
| 815 | }; | ||
| 816 | |||
| 817 | if (acpi_state < 6 && states[acpi_state]) | ||
| 818 | return pm_suspend(states[acpi_state]); | ||
| 819 | if (acpi_state == 4) | ||
| 820 | return hibernate(); | ||
| 821 | return -EINVAL; | ||
| 822 | } | ||
| 823 | |||
| 824 | static void acpi_power_off_prepare(void) | 809 | static void acpi_power_off_prepare(void) |
| 825 | { | 810 | { |
| 826 | /* Prepare to power off the system */ | 811 | /* Prepare to power off the system */ |
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h index 0143540a2519..c797ffa568d5 100644 --- a/drivers/acpi/sleep.h +++ b/drivers/acpi/sleep.h | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | 1 | ||
| 2 | extern int acpi_suspend(u32 state); | ||
| 3 | |||
| 4 | extern void acpi_enable_wakeup_devices(u8 sleep_state); | 2 | extern void acpi_enable_wakeup_devices(u8 sleep_state); |
| 5 | extern void acpi_disable_wakeup_devices(u8 sleep_state); | 3 | extern void acpi_disable_wakeup_devices(u8 sleep_state); |
| 6 | 4 | ||
