Commit c522ad06 authored by Erik Kaneda's avatar Erik Kaneda Committed by Rafael J. Wysocki
Browse files

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


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 86a33cf3

drivers/acpi/acpica/exconfig.c

+6 −10
Original line number Original line Diff line number Diff line
@@ -174,12 +174,9 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state, 
		return_ACPI_STATUS(status);

		return_ACPI_STATUS(status);

	}

	}





	/* Complete the initialization/resolution of package objects */

	/* Complete the initialization/resolution of new objects */





	status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,

	acpi_ns_initialize_objects();

					ACPI_UINT32_MAX, 0,

					acpi_ns_init_one_package, NULL, NULL,

					NULL);





	/* Parameter Data (optional) */

	/* Parameter Data (optional) */
@@ -437,12 +434,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, 
		return_ACPI_STATUS(status);

		return_ACPI_STATUS(status);

	}

	}





	/* Complete the initialization/resolution of package objects */

	/* Complete the initialization/resolution of new objects */





	status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,

	acpi_ex_exit_interpreter();

					ACPI_UINT32_MAX, 0,

	acpi_ns_initialize_objects();

					acpi_ns_init_one_package, NULL, NULL,

	acpi_ex_enter_interpreter();

					NULL);





	/* Store the ddb_handle into the Target operand */

	/* Store the ddb_handle into the Target operand */

drivers/acpi/acpica/tbxfload.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -297,15 +297,11 @@ acpi_status acpi_load_table(struct acpi_table_header *table) 
	status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),

	status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),

						ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,

						ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,

						FALSE, &table_index);

						FALSE, &table_index);



	if (ACPI_SUCCESS(status)) {

	if (ACPI_SUCCESS(status)) {

		/* Complete the initialization/resolution of package objects */





		status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE,

		/* Complete the initialization/resolution of new objects */

						ACPI_ROOT_OBJECT,



						ACPI_UINT32_MAX, 0,

		acpi_ns_initialize_objects();

						acpi_ns_init_one_package,

						NULL, NULL, NULL);

	}

	}





	return_ACPI_STATUS(status);

	return_ACPI_STATUS(status);