ACPICA: acpisrc: Add missing tables to astable

ACPICA commit d4a2c93198cdd9c6f4a83798345851fee96d5ca5

Also renames struct acpi_data_table_mapping's struct to
struct acpi_data_table_mapping, just so conversion goes smoothly.

Link: https://github.com/acpica/acpica/commit/d4a2c931
Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index ca4ba6b351feefabbe93e0380688e8edd2ec5510..792d1a5f0052925ba7568b25519aae548d9b9ec5 100644 (file)
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -430,7 +430,7 @@ acpi_ev_data_table_region_setup(acpi_handle handle,
 {
        union acpi_operand_object *region_desc =
            (union acpi_operand_object *)handle;
-       struct acpi_data_table_space_context *local_region_context;
+       struct acpi_data_table_mapping *local_region_context;
 
        ACPI_FUNCTION_TRACE(ev_data_table_region_setup);
 
@@ -445,7 +445,7 @@ acpi_ev_data_table_region_setup(acpi_handle handle,
        /* Create a new context */
 
        local_region_context =
-           ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_data_table_space_context));
+           ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_data_table_mapping));
        if (!(local_region_context)) {
                return_ACPI_STATUS(AE_NO_MEMORY);
        }

diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 4ff35852c0b38ddef6982862a772cdb788423be0..6d4a4cc148506894ed132a09e5ff2f70c1cd5f86 100644 (file)
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -509,12 +509,12 @@ acpi_ex_data_table_space_handler(u32 function,
                                 u64 *value,
                                 void *handler_context, void *region_context)
 {
-       struct acpi_data_table_space_context *mapping;
+       struct acpi_data_table_mapping *mapping;
        char *pointer;
 
        ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
 
-       mapping = (struct acpi_data_table_space_context *) region_context;
+       mapping = (struct acpi_data_table_mapping *) region_context;
        pointer = ACPI_CAST_PTR(char, mapping->pointer) +
            (address - ACPI_PTR_TO_PHYSADDR(mapping->pointer));
 

diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 95e4f56f97546665165c3ede9ed85f8451f40c6a..46878cbb7d39f68937244c6abcc33d78a2f379e7 100644 (file)
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -1240,7 +1240,7 @@ struct acpi_mem_space_context {
        struct acpi_mem_mapping *first_mm;
 };
 
-struct acpi_data_table_space_context {
+struct acpi_data_table_mapping {
        void *pointer;
 };