2 files changed, 8 insertions, 18 deletions

diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 12b49d312ad3..a54885993ed3 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -422,10 +422,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         /* Read the Status Register */
 
                         status =
-                            acpi_hw_low_level_read(ACPI_GPE_REGISTER_WIDTH,
-                                                   &status_reg,
-                                                   &gpe_register_info->
-                                                   status_address);
+                            acpi_read(&status_reg,
+                                      &gpe_register_info->status_address);
                         if (ACPI_FAILURE(status)) {
                                 goto unlock_and_exit;
                         }
@@ -433,10 +431,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         /* Read the Enable Register */
 
                         status =
-                            acpi_hw_low_level_read(ACPI_GPE_REGISTER_WIDTH,
-                                                   &enable_reg,
-                                                   &gpe_register_info->
-                                                   enable_address);
+                            acpi_read(&enable_reg,
+                                      &gpe_register_info->enable_address);
                         if (ACPI_FAILURE(status)) {
                                 goto unlock_and_exit;
                         }
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 2872be2b9be5..488503ffcd3e 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -830,10 +830,8 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                     ACPI_GPE_REGISTER_WIDTH;
                 this_register->enable_address.bit_width =
                     ACPI_GPE_REGISTER_WIDTH;
-                this_register->status_address.bit_offset =
-                    ACPI_GPE_REGISTER_WIDTH;
-                this_register->enable_address.bit_offset =
-                    ACPI_GPE_REGISTER_WIDTH;
+                this_register->status_address.bit_offset = 0;
+                this_register->enable_address.bit_offset = 0;
 
                 /* Init the event_info for each GPE within this register */
 
@@ -846,18 +844,14 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
 
                 /* Disable all GPEs within this register */
 
-                status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, 0x00,
-                                                 &this_register->
-                                                 enable_address);
+                status = acpi_write(0x00, &this_register->enable_address);
                 if (ACPI_FAILURE(status)) {
                         goto error_exit;
                 }
 
                 /* Clear any pending GPE events within this register */
 
-                status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, 0xFF,
-                                                 &this_register->
-                                                 status_address);
+                status = acpi_write(0xFF, &this_register->status_address);
                 if (ACPI_FAILURE(status)) {
                         goto error_exit;
                 }