diff options
author | Erik Schmauss <erik.schmauss@intel.com> | 2019-07-11 12:58:21 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-11 16:38:42 -0400 |
commit | d1fb5b2f623b1af5a0d2a83d205df1b61f430dc6 (patch) | |
tree | 2cf6d6e10f76a1eaab1d5d4b8784c4cf38a291d7 | |
parent | a131c2bf165684315f606fdd88cf80be22ba32f3 (diff) |
ACPICA: Update table load object initialization
ACPICA commit c7ef9f3526765bed8930825dda1eed1a274b9668
Use the common internal "initialize objects" interface
Affects:
Load()
load_table()
acpi_load_table
Link: https://github.com/acpica/acpica/commit/c7ef9f35
Tested-by: Rong Chen <rong.a.chen@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/acpica/exconfig.c | 18 | ||||
-rw-r--r-- | drivers/acpi/acpica/tbxfload.c | 10 |
2 files changed, 11 insertions, 17 deletions
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c index 587aeeeb5070..46a8baf28bd0 100644 --- a/drivers/acpi/acpica/exconfig.c +++ b/drivers/acpi/acpica/exconfig.c | |||
@@ -174,12 +174,11 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state, | |||
174 | return_ACPI_STATUS(status); | 174 | return_ACPI_STATUS(status); |
175 | } | 175 | } |
176 | 176 | ||
177 | /* Complete the initialization/resolution of package objects */ | 177 | /* Complete the initialization/resolution of new objects */ |
178 | 178 | ||
179 | status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT, | 179 | acpi_ex_exit_interpreter(); |
180 | ACPI_UINT32_MAX, 0, | 180 | acpi_ns_initialize_objects(); |
181 | acpi_ns_init_one_package, NULL, NULL, | 181 | acpi_ex_enter_interpreter(); |
182 | NULL); | ||
183 | 182 | ||
184 | /* Parameter Data (optional) */ | 183 | /* Parameter Data (optional) */ |
185 | 184 | ||
@@ -437,12 +436,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, | |||
437 | return_ACPI_STATUS(status); | 436 | return_ACPI_STATUS(status); |
438 | } | 437 | } |
439 | 438 | ||
440 | /* Complete the initialization/resolution of package objects */ | 439 | /* Complete the initialization/resolution of new objects */ |
441 | 440 | ||
442 | status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT, | 441 | acpi_ex_exit_interpreter(); |
443 | ACPI_UINT32_MAX, 0, | 442 | acpi_ns_initialize_objects(); |
444 | acpi_ns_init_one_package, NULL, NULL, | 443 | acpi_ex_enter_interpreter(); |
445 | NULL); | ||
446 | 444 | ||
447 | /* Store the ddb_handle into the Target operand */ | 445 | /* Store the ddb_handle into the Target operand */ |
448 | 446 | ||
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c index ef8f8a9f3c9c..86f1693f6d29 100644 --- a/drivers/acpi/acpica/tbxfload.c +++ b/drivers/acpi/acpica/tbxfload.c | |||
@@ -297,15 +297,11 @@ acpi_status acpi_load_table(struct acpi_table_header *table) | |||
297 | status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table), | 297 | status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table), |
298 | ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, | 298 | ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, |
299 | FALSE, &table_index); | 299 | FALSE, &table_index); |
300 | |||
301 | if (ACPI_SUCCESS(status)) { | 300 | if (ACPI_SUCCESS(status)) { |
302 | /* Complete the initialization/resolution of package objects */ | ||
303 | 301 | ||
304 | status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, | 302 | /* Complete the initialization/resolution of new objects */ |
305 | ACPI_ROOT_OBJECT, | 303 | |
306 | ACPI_UINT32_MAX, 0, | 304 | acpi_ns_initialize_objects(); |
307 | acpi_ns_init_one_package, | ||
308 | NULL, NULL, NULL); | ||
309 | } | 305 | } |
310 | 306 | ||
311 | return_ACPI_STATUS(status); | 307 | return_ACPI_STATUS(status); |