1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index cdd56c4657e0..2604189d6cd1 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -333,7 +333,6 @@ acpi_table_parse_entries_array(char *id,
                          unsigned int max_entries)
 {
         struct acpi_table_header *table_header = NULL;
-        acpi_size tbl_size;
         int count;
         u32 instance = 0;
 
@@ -346,7 +345,7 @@ acpi_table_parse_entries_array(char *id,
         if (!strncmp(id, ACPI_SIG_MADT, 4))
                 instance = acpi_apic_instance;
 
-        acpi_get_table_with_size(id, instance, &table_header, &tbl_size);
+        acpi_get_table(id, instance, &table_header);
         if (!table_header) {
                 pr_warn("%4.4s not present\n", id);
                 return -ENODEV;
@@ -355,7 +354,7 @@ acpi_table_parse_entries_array(char *id,
         count = acpi_parse_entries_array(id, table_size, table_header,
                         proc, proc_num, max_entries);
 
-        early_acpi_os_unmap_memory((char *)table_header, tbl_size);
+        acpi_put_table(table_header);
         return count;
 }
 
@@ -397,7 +396,6 @@ acpi_table_parse_madt(enum acpi_madt_type id,
 int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
 {
         struct acpi_table_header *table = NULL;
-        acpi_size tbl_size;
 
         if (acpi_disabled)
                 return -ENODEV;
@@ -406,13 +404,13 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
                 return -EINVAL;
 
         if (strncmp(id, ACPI_SIG_MADT, 4) == 0)
-                acpi_get_table_with_size(id, acpi_apic_instance, &table, &tbl_size);
+                acpi_get_table(id, acpi_apic_instance, &table);
         else
-                acpi_get_table_with_size(id, 0, &table, &tbl_size);
+                acpi_get_table(id, 0, &table);
 
         if (table) {
                 handler(table);
-                early_acpi_os_unmap_memory(table, tbl_size);
+                acpi_put_table(table);
                 return 0;
         } else
                 return -ENODEV;
@@ -426,16 +424,15 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
 static void __init check_multiple_madt(void)
 {
         struct acpi_table_header *table = NULL;
-        acpi_size tbl_size;
 
-        acpi_get_table_with_size(ACPI_SIG_MADT, 2, &table, &tbl_size);
+        acpi_get_table(ACPI_SIG_MADT, 2, &table);
         if (table) {
                 pr_warn("BIOS bug: multiple APIC/MADT found, using %d\n",
                         acpi_apic_instance);
                 pr_warn("If \"acpi_apic_instance=%d\" works better, "
                         "notify linux-acpi@vger.kernel.org\n",
                         acpi_apic_instance ? 0 : 2);
-                early_acpi_os_unmap_memory(table, tbl_size);
+                acpi_put_table(table);
 
         } else
                 acpi_apic_instance = 0;