ACPI / PM: Do not reconfigure GPEs for suspend-to-idle

[mirror_ubuntu-artful-kernel.git] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 59b78e42a58bd34298c385e27e7d38118923f8f0..d3d569ba6d46472972cb859d5bdc9d0b2e4cda44 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -771,15 +771,8 @@ static int acpi_freeze_prepare(void)
        if (lps0_device_handle) {
                acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF);
                acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY);
-       } else {
-               /*
-                * The configuration of GPEs is changed here to avoid spurious
-                * wakeups, but that should not be necessary if this is a
-                * "low-power S0" platform and the low-power S0 _DSM is present.
-                */
-               acpi_enable_all_wakeup_gpes();
-               acpi_os_wait_events_complete();
        }
+
        if (acpi_sci_irq_valid())
                enable_irq_wake(acpi_sci_irq);
 
@@ -821,8 +814,6 @@ static void acpi_freeze_restore(void)
        if (lps0_device_handle) {
                acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT);
                acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON);
-       } else {
-               acpi_enable_all_runtime_gpes();
        }
 }