ACPICA: Tables: Cleanup acpi_tb_install_and_load_table()

ACPICA commit 7fdac0289faa1c28b91413c8e394e87372aa69e6

acpi_tb_install_and_load_table() can invoke acpi_tb_load_table() to eliminate
redundant code.

No functional change. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/7fdac028
Signed-off-by: Lv Zheng <lv.zheng@intel.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/actables.h b/drivers/acpi/acpica/actables.h
index e85953b6fa0edcac98631c006b09ea16fb2353fe..1850005c5c7a70a1464d6101494d0596cdc58c9b 100644 (file)
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -127,8 +127,7 @@ acpi_status
 acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node);
 
 acpi_status
-acpi_tb_install_and_load_table(struct acpi_table_header *table,
-                              acpi_physical_address address,
+acpi_tb_install_and_load_table(acpi_physical_address address,
                               u8 flags, u8 override, u32 *table_index);
 
 void acpi_tb_terminate(void);

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 718428ba0b89ee8ed52e6ffc74f6ce32ab6221d7..8b8d620e2656e1782fee9ede577ffc376dabf34f 100644 (file)
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -437,10 +437,9 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
        ACPI_INFO(("Dynamic OEM Table Load:"));
        acpi_ex_exit_interpreter();
-       status =
-           acpi_tb_install_and_load_table(table, ACPI_PTR_TO_PHYSADDR(table),
-                                          ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
-                                          TRUE, &table_index);
+       status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),
+                                               ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
+                                               TRUE, &table_index);
        acpi_ex_enter_interpreter();
        if (ACPI_FAILURE(status)) {
 

diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c
index d9ca8c2aa2d3cc5a28ec55987c5f90eab513e46a..4cbfa30b6c0511c1252d3af47af72aa8205578af 100644 (file)
--- a/drivers/acpi/acpica/tbdata.c
+++ b/drivers/acpi/acpica/tbdata.c
@@ -832,9 +832,9 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)
  *
  * FUNCTION:    acpi_tb_install_and_load_table
  *
- * PARAMETERS:  table                   - Pointer to the table
- *              address                 - Physical address of the table
+ * PARAMETERS:  address                 - Physical address of the table
  *              flags                   - Allocation flags of the table
+ *              override                - Whether override should be performed
  *              table_index             - Where table index is returned
  *
  * RETURN:      Status
@@ -844,15 +844,13 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)
  ******************************************************************************/
 
 acpi_status
-acpi_tb_install_and_load_table(struct acpi_table_header *table,
-                              acpi_physical_address address,
+acpi_tb_install_and_load_table(acpi_physical_address address,
                               u8 flags, u8 override, u32 *table_index)
 {
        acpi_status status;
        u32 i;
-       acpi_owner_id owner_id;
 
-       ACPI_FUNCTION_TRACE(acpi_load_table);
+       ACPI_FUNCTION_TRACE(tb_install_and_load_table);
 
        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
 
@@ -864,41 +862,8 @@ acpi_tb_install_and_load_table(struct acpi_table_header *table,
                goto unlock_and_exit;
        }
 
-       /*
-        * Note: Now table is "INSTALLED", it must be validated before
-        * using.
-        */
-       status = acpi_tb_validate_table(&acpi_gbl_root_table_list.tables[i]);
-       if (ACPI_FAILURE(status)) {
-               goto unlock_and_exit;
-       }
-
        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-       status = acpi_ns_load_table(i, acpi_gbl_root_node);
-
-       /* Execute any module-level code that was found in the table */
-
-       if (!acpi_gbl_parse_table_as_term_list
-           && acpi_gbl_group_module_level_code) {
-               acpi_ns_exec_module_code_list();
-       }
-
-       /*
-        * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is
-        * responsible for discovering any new wake GPEs by running _PRW methods
-        * that may have been loaded by this table.
-        */
-       status = acpi_tb_get_owner_id(i, &owner_id);
-       if (ACPI_SUCCESS(status)) {
-               acpi_ev_update_gpes(owner_id);
-       }
-
-       /* Invoke table handler if present */
-
-       if (acpi_gbl_table_handler) {
-               (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_LOAD, table,
-                                            acpi_gbl_table_handler_context);
-       }
+       status = acpi_tb_load_table(i, acpi_gbl_root_node);
        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
 
 unlock_and_exit:

diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index 2599e8314d94729636b2540396cf124ab1cdd432..77de33b76c857a2170b6643a8ed133c175c6567f 100644 (file)
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -330,10 +330,9 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
        /* Install the table and load it into the namespace */
 
        ACPI_INFO(("Host-directed Dynamic ACPI Table Load:"));
-       status =
-           acpi_tb_install_and_load_table(table, ACPI_PTR_TO_PHYSADDR(table),
-                                          ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,
-                                          FALSE, &table_index);
+       status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),
+                                               ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,
+                                               FALSE, &table_index);
        return_ACPI_STATUS(status);
 }