3 files changed, 17 insertions, 17 deletions

diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 8daeabb2fc7a..3536bbb990c3 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.c
@@ -374,7 +374,7 @@ acpi_hw_enable_wakeup_gpe_block (
  *
  * FUNCTION:    acpi_hw_disable_all_gpes
  *
- * PARAMETERS:  Flags           - ACPI_NOT_ISR or ACPI_ISR
+ * PARAMETERS:  None
  *
  * RETURN:      Status
  *
@@ -384,7 +384,7 @@ acpi_hw_enable_wakeup_gpe_block (
 
 acpi_status
 acpi_hw_disable_all_gpes (
-        u32                             flags)
+        void)
 {
         acpi_status                     status;
 
@@ -392,8 +392,8 @@ acpi_hw_disable_all_gpes (
         ACPI_FUNCTION_TRACE ("hw_disable_all_gpes");
 
 
-        status = acpi_ev_walk_gpe_list (acpi_hw_disable_gpe_block, flags);
-        status = acpi_ev_walk_gpe_list (acpi_hw_clear_gpe_block, flags);
+        status = acpi_ev_walk_gpe_list (acpi_hw_disable_gpe_block);
+        status = acpi_ev_walk_gpe_list (acpi_hw_clear_gpe_block);
         return_ACPI_STATUS (status);
 }
 
@@ -402,7 +402,7 @@ acpi_hw_disable_all_gpes (
  *
  * FUNCTION:    acpi_hw_enable_all_runtime_gpes
  *
- * PARAMETERS:  Flags           - ACPI_NOT_ISR or ACPI_ISR
+ * PARAMETERS:  None
  *
  * RETURN:      Status
  *
@@ -412,7 +412,7 @@ acpi_hw_disable_all_gpes (
 
 acpi_status
 acpi_hw_enable_all_runtime_gpes (
-        u32                             flags)
+        void)
 {
         acpi_status                     status;
 
@@ -420,7 +420,7 @@ acpi_hw_enable_all_runtime_gpes (
         ACPI_FUNCTION_TRACE ("hw_enable_all_runtime_gpes");
 
 
-        status = acpi_ev_walk_gpe_list (acpi_hw_enable_runtime_gpe_block, flags);
+        status = acpi_ev_walk_gpe_list (acpi_hw_enable_runtime_gpe_block);
         return_ACPI_STATUS (status);
 }
 
@@ -429,7 +429,7 @@ acpi_hw_enable_all_runtime_gpes (
  *
  * FUNCTION:    acpi_hw_enable_all_wakeup_gpes
  *
- * PARAMETERS:  Flags           - ACPI_NOT_ISR or ACPI_ISR
+ * PARAMETERS:  None
  *
  * RETURN:      Status
  *
@@ -439,7 +439,7 @@ acpi_hw_enable_all_runtime_gpes (
 
 acpi_status
 acpi_hw_enable_all_wakeup_gpes (
-        u32                             flags)
+        void)
 {
         acpi_status                     status;
 
@@ -447,7 +447,7 @@ acpi_hw_enable_all_wakeup_gpes (
         ACPI_FUNCTION_TRACE ("hw_enable_all_wakeup_gpes");
 
 
-        status = acpi_ev_walk_gpe_list (acpi_hw_enable_wakeup_gpe_block, flags);
+        status = acpi_ev_walk_gpe_list (acpi_hw_enable_wakeup_gpe_block);
         return_ACPI_STATUS (status);
 }
 
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 6d9e4eb84836..04a058565d8d 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -106,7 +106,7 @@ acpi_hw_clear_acpi_status (
 
         /* Clear the GPE Bits in all GPE registers in all GPE blocks */
 
-        status = acpi_ev_walk_gpe_list (acpi_hw_clear_gpe_block, ACPI_ISR);
+        status = acpi_ev_walk_gpe_list (acpi_hw_clear_gpe_block);
 
 unlock_and_exit:
         if (flags & ACPI_MTX_LOCK) {
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 415d342aeab5..cedee0c43b5f 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -274,13 +274,13 @@ acpi_enter_sleep_state (
          * 1) Disable/Clear all GPEs
          * 2) Enable all wakeup GPEs
          */
-        status = acpi_hw_disable_all_gpes (ACPI_ISR);
+        status = acpi_hw_disable_all_gpes ();
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
         }
         acpi_gbl_system_awake_and_running = FALSE;
 
-        status = acpi_hw_enable_all_wakeup_gpes (ACPI_ISR);
+        status = acpi_hw_enable_all_wakeup_gpes ();
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
         }
@@ -424,13 +424,13 @@ acpi_enter_sleep_state_s4bios (
          * 1) Disable/Clear all GPEs
          * 2) Enable all wakeup GPEs
          */
-        status = acpi_hw_disable_all_gpes (ACPI_ISR);
+        status = acpi_hw_disable_all_gpes ();
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
         }
         acpi_gbl_system_awake_and_running = FALSE;
 
-        status = acpi_hw_enable_all_wakeup_gpes (ACPI_ISR);
+        status = acpi_hw_enable_all_wakeup_gpes ();
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
         }
@@ -557,13 +557,13 @@ acpi_leave_sleep_state (
          * 1) Disable/Clear all GPEs
          * 2) Enable all runtime GPEs
          */
-        status = acpi_hw_disable_all_gpes (ACPI_NOT_ISR);
+        status = acpi_hw_disable_all_gpes ();
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
         }
         acpi_gbl_system_awake_and_running = TRUE;
 
-        status = acpi_hw_enable_all_runtime_gpes (ACPI_NOT_ISR);
+        status = acpi_hw_enable_all_runtime_gpes ();
         if (ACPI_FAILURE (status)) {
                 return_ACPI_STATUS (status);
         }