1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index a9d4fea4167f..9af361a191e7 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -86,7 +86,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
          */
         if (!acpi_gbl_FADT.acpi_enable && !acpi_gbl_FADT.acpi_disable) {
                 ACPI_ERROR((AE_INFO,
-                            "No ACPI mode transition supported in this system (enable/disable both zero)"));
+                            "No ACPI mode transition supported in this system "
+                            "(enable/disable both zero)"));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -95,7 +96,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
 
                 /* BIOS should have disabled ALL fixed and GP events */
 
-                status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
+                status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
                                             (u32) acpi_gbl_FADT.acpi_enable, 8);
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Attempting to enable ACPI mode\n"));
@@ -107,7 +108,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
                  * BIOS should clear all fixed status bits and restore fixed event
                  * enable bits to default
                  */
-                status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
+                status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
                                             (u32) acpi_gbl_FADT.acpi_disable,
                                             8);
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -172,7 +173,7 @@ u32 acpi_hw_get_mode(void)
                 return_UINT32(ACPI_SYS_MODE_ACPI);
         }
 
-        status = acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value);
+        status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
         if (ACPI_FAILURE(status)) {
                 return_UINT32(ACPI_SYS_MODE_LEGACY);
         }