1 files changed, 13 insertions, 57 deletions

diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 341a38ce8aa6..85445fb5844e 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -439,8 +439,6 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
 {
         acpi_status status;
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_gpe_walk_info walk_info;
-        u32 wake_gpe_count;
         u32 gpe_enabled_count;
         u32 gpe_index;
         u32 gpe_number;
@@ -456,37 +454,9 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
         }
 
         /*
-         * Runtime option: Should wake GPEs be enabled at runtime?  The default
-         * is no, they should only be enabled just as the machine goes to sleep.
+         * Enable all GPEs that have a corresponding method.  Any other GPEs
+         * within this block must be enabled via the acpi_enable_gpe interface.
          */
-        if (acpi_gbl_leave_wake_gpes_disabled) {
-                /*
-                 * Differentiate runtime vs wake GPEs, via the _PRW control methods.
-                 * Each GPE that has one or more _PRWs that reference it is by
-                 * definition a wake GPE and will not be enabled while the machine
-                 * is running.
-                 */
-                walk_info.gpe_block = gpe_block;
-                walk_info.gpe_device = gpe_device;
-                walk_info.execute_by_owner_id = FALSE;
-
-                status =
-                    acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                           ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
-                                           acpi_ev_match_prw_and_gpe, NULL,
-                                           &walk_info, NULL);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "While executing _PRW methods"));
-                }
-        }
-
-        /*
-         * Enable all GPEs that have a corresponding method and are not
-         * capable of generating wakeups. Any other GPEs within this block
-         * must be enabled via the acpi_enable_gpe interface.
-         */
-        wake_gpe_count = 0;
         gpe_enabled_count = 0;
 
         if (gpe_device == acpi_gbl_fadt_gpe_device) {
@@ -502,35 +472,21 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
                         gpe_event_info = &gpe_block->event_info[gpe_index];
                         gpe_number = gpe_index + gpe_block->block_base_number;
 
-                        /*
-                         * If the GPE has already been enabled for runtime
-                         * signaling, make sure it remains enabled, but do not
-                         * increment its reference counter.
-                         */
-                        if (gpe_event_info->runtime_count) {
-                                acpi_set_gpe(gpe_device, gpe_number,
-                                                ACPI_GPE_ENABLE);
-                                gpe_enabled_count++;
-                                continue;
-                        }
-
-                        if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
-                                wake_gpe_count++;
-                                if (acpi_gbl_leave_wake_gpes_disabled) {
-                                        continue;
-                                }
-                        }
-
                         /* Ignore GPEs that have no corresponding _Lxx/_Exx method */
 
                         if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD)) {
                                 continue;
                         }
 
-                        /* Enable this GPE */
+                        /*
+                         * If the GPE has already been enabled for runtime
+                         * signaling, make sure it remains enabled, but do not
+                         * increment its reference counter.
+                         */
+                        status = gpe_event_info->runtime_count ?
+                                acpi_ev_enable_gpe(gpe_event_info) :
+                                acpi_enable_gpe(gpe_device, gpe_number);
 
-                        status = acpi_enable_gpe(gpe_device, gpe_number,
-                                                 ACPI_GPE_TYPE_RUNTIME);
                         if (ACPI_FAILURE(status)) {
                                 ACPI_EXCEPTION((AE_INFO, status,
                                                 "Could not enable GPE 0x%02X",
@@ -542,10 +498,10 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
                 }
         }
 
-        if (gpe_enabled_count || wake_gpe_count) {
+        if (gpe_enabled_count) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INIT,
-                                  "Enabled %u Runtime GPEs, added %u Wake GPEs in this block\n",
-                                  gpe_enabled_count, wake_gpe_count));
+                                  "Enabled %u GPEs in this block\n",
+                                  gpe_enabled_count));
         }
 
         return_ACPI_STATUS(AE_OK);