Merge branch 'acpica-gpe' into release

1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index e4625f919814..cf82989ae756 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -646,18 +646,9 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
                 return -ENODEV;
         }
 
-        if (enable) {
-                error = acpi_enable_wakeup_device_power(adev,
-                                                acpi_target_sleep_state);
-                if (!error)
-                        acpi_enable_gpe(adev->wakeup.gpe_device,
-                                        adev->wakeup.gpe_number,
-                                        ACPI_GPE_TYPE_WAKE);
-        } else {
-                acpi_disable_gpe(adev->wakeup.gpe_device, adev->wakeup.gpe_number,
-                                ACPI_GPE_TYPE_WAKE);
-                error = acpi_disable_wakeup_device_power(adev);
-        }
+        error = enable ?
+                acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
+                acpi_disable_wakeup_device_power(adev);
         if (!error)
                 dev_info(dev, "wake-up capability %s by ACPI\n",
                                 enable ? "enabled" : "disabled");