ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write}

use_lock flag is used once for acpi_hw_register_read, and never for
acpi_hw_register_write. It will greatly simplify understanding of
locking if we just drop this use_lock altogether, and wrap the only call
to ..._read in lock/unlock.

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 9 insertions, 18 deletions

diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index cf69c0040a39..4d0c677fac19 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -313,8 +313,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         /* Get current value of PM1A control */
 
-        status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                       ACPI_REGISTER_PM1_CONTROL, &PM1Acontrol);
+        status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL, &PM1Acontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -341,15 +340,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         /* Write #1: fill in SLP_TYP data */
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1A_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1A_CONTROL,
                                         PM1Acontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1B_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1B_CONTROL,
                                         PM1Bcontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -364,15 +361,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         ACPI_FLUSH_CPU_CACHE();
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1A_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1A_CONTROL,
                                         PM1Acontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1B_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1B_CONTROL,
                                         PM1Bcontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -392,8 +387,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
                  */
                 acpi_os_stall(10000000);
 
-                status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                ACPI_REGISTER_PM1_CONTROL,
+                status = acpi_hw_register_write(ACPI_REGISTER_PM1_CONTROL,
                                                 sleep_enable_reg_info->
                                                 access_bit_mask);
                 if (ACPI_FAILURE(status)) {
@@ -520,8 +514,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
 
                 /* Get current value of PM1A control */
 
-                status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                               ACPI_REGISTER_PM1_CONTROL,
+                status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL,
                                                &PM1Acontrol);
                 if (ACPI_SUCCESS(status)) {
 
@@ -543,11 +536,9 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
 
                         /* Just ignore any errors */
 
-                        (void)acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                     ACPI_REGISTER_PM1A_CONTROL,
+                        (void)acpi_hw_register_write(ACPI_REGISTER_PM1A_CONTROL,
                                                      PM1Acontrol);
-                        (void)acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                     ACPI_REGISTER_PM1B_CONTROL,
+                        (void)acpi_hw_register_write(ACPI_REGISTER_PM1B_CONTROL,
                                                      PM1Bcontrol);
                 }
         }