3 files changed, 14 insertions, 29 deletions

diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index 9c7df711c18d..dbcc4c0d037c 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -171,8 +171,7 @@ u32 acpi_hw_get_mode(void)
                 return_UINT32(ACPI_SYS_MODE_ACPI);
         }
 
-        status =
-            acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value, ACPI_MTX_LOCK);
+        status = acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value);
         if (ACPI_FAILURE(status)) {
                 return_UINT32(ACPI_SYS_MODE_LEGACY);
         }
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 9fe7adf21f8b..716e4aeca1e1 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -54,17 +54,15 @@ ACPI_MODULE_NAME("hwregs")
  *
  * FUNCTION:    acpi_hw_clear_acpi_status
  *
- * PARAMETERS:  Flags           - Lock the hardware or not
+ * PARAMETERS:  None
  *
- * RETURN:      none
+ * RETURN:      None
  *
  * DESCRIPTION: Clears all fixed and general purpose status bits
  *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
  *
- * NOTE: TBD: Flags parameter is obsolete, to be removed
- *
  ******************************************************************************/
-acpi_status acpi_hw_clear_acpi_status(u32 flags)
+acpi_status acpi_hw_clear_acpi_status(void)
 {
         acpi_status status;
         acpi_cpu_flags lock_flags = 0;
@@ -253,18 +251,15 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
  *
  * PARAMETERS:  register_id     - ID of ACPI bit_register to access
  *              return_value    - Value that was read from the register
- *              Flags           - Lock the hardware or not
  *
  * RETURN:      Status and the value read from specified Register. Value
  *              returned is normalized to bit0 (is shifted all the way right)
  *
  * DESCRIPTION: ACPI bit_register read function.
  *
- * NOTE: TBD: Flags parameter is obsolete, to be removed
- *
  ******************************************************************************/
 
-acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)
+acpi_status acpi_get_register(u32 register_id, u32 * return_value)
 {
         u32 register_value = 0;
         struct acpi_bit_register_info *bit_reg_info;
@@ -312,16 +307,13 @@ ACPI_EXPORT_SYMBOL(acpi_get_register)
  * PARAMETERS:  register_id     - ID of ACPI bit_register to access
  *              Value           - (only used on write) value to write to the
  *                                Register, NOT pre-normalized to the bit pos
- *              Flags           - Lock the hardware or not
  *
  * RETURN:      Status
  *
  * DESCRIPTION: ACPI Bit Register write function.
  *
- * NOTE: TBD: Flags parameter is obsolete, to be removed
- *
  ******************************************************************************/
-acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
+acpi_status acpi_set_register(u32 register_id, u32 value)
 {
         u32 register_value = 0;
         struct acpi_bit_register_info *bit_reg_info;
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 6faa76bdc3d5..7c9645129210 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -277,15 +277,14 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         /* Clear wake status */
 
-        status =
-            acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
+        status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
         /* Clear all fixed and general purpose status bits */
 
-        status = acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK);
+        status = acpi_hw_clear_acpi_status();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -398,8 +397,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
         /* Wait until we enter sleep state */
 
         do {
-                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value,
-                                           ACPI_MTX_DO_NOT_LOCK);
+                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
@@ -432,13 +430,12 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
 
         ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);
 
-        status =
-            acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
+        status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        status = acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK);
+        status = acpi_hw_clear_acpi_status();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -465,8 +462,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
 
         do {
                 acpi_os_stall(1000);
-                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value,
-                                           ACPI_MTX_DO_NOT_LOCK);
+                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
@@ -599,13 +595,11 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
 
         (void)
             acpi_set_register(acpi_gbl_fixed_event_info
-                              [ACPI_EVENT_POWER_BUTTON].enable_register_id, 1,
-                              ACPI_MTX_DO_NOT_LOCK);
+                              [ACPI_EVENT_POWER_BUTTON].enable_register_id, 1);
 
         (void)
             acpi_set_register(acpi_gbl_fixed_event_info
-                              [ACPI_EVENT_POWER_BUTTON].status_register_id, 1,
-                              ACPI_MTX_DO_NOT_LOCK);
+                              [ACPI_EVENT_POWER_BUTTON].status_register_id, 1);
 
         arg.integer.value = ACPI_SST_WORKING;
         status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);