powerpc/hvsi: Fix endianness issues in the HVSI driver

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 7f251dd1a6870df8e21c4b3e87d8ec6b193c5663..2f0d4db40a9e8aa078787b177d138322fdd6c0b9 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -629,6 +629,7 @@ static int acpi_freeze_begin(void)
 
 static int acpi_freeze_prepare(void)
 {
+       acpi_enable_wakeup_devices(ACPI_STATE_S0);
        acpi_enable_all_wakeup_gpes();
        acpi_os_wait_events_complete();
        enable_irq_wake(acpi_gbl_FADT.sci_interrupt);
@@ -637,6 +638,7 @@ static int acpi_freeze_prepare(void)
 
 static void acpi_freeze_restore(void)
 {
+       acpi_disable_wakeup_devices(ACPI_STATE_S0);
        disable_irq_wake(acpi_gbl_FADT.sci_interrupt);
        acpi_enable_all_runtime_gpes();
 }
@@ -806,21 +808,6 @@ static void acpi_sleep_hibernate_setup(void)
 static inline void acpi_sleep_hibernate_setup(void) {}
 #endif /* !CONFIG_HIBERNATION */
 
-int acpi_suspend(u32 acpi_state)
-{
-       suspend_state_t states[] = {
-               [1] = PM_SUSPEND_STANDBY,
-               [3] = PM_SUSPEND_MEM,
-               [5] = PM_SUSPEND_MAX
-       };
-
-       if (acpi_state < 6 && states[acpi_state])
-               return pm_suspend(states[acpi_state]);
-       if (acpi_state == 4)
-               return hibernate();
-       return -EINVAL;
-}
-
 static void acpi_power_off_prepare(void)
 {
        /* Prepare to power off the system */