ACPICA: Use manifest constants for parse pass number (ec3153fb) · Commits · 戴 / test

drivers/acpi/dispatcher/dsmethod.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -382,7 +382,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,

		status = acpi_ds_init_aml_walk(next_walk_state, NULL, method_node,
		obj_desc->method.aml_start,
		obj_desc->method.aml_length, info, 3);
		obj_desc->method.aml_length, info,
		ACPI_IMODE_EXECUTE);

		ACPI_FREE(info);
		if (ACPI_FAILURE(status)) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
		}

		status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
		aml_length, NULL, 1);
		aml_length, NULL, ACPI_IMODE_LOAD_PASS1);
		if (ACPI_FAILURE(status)) {
		acpi_ds_delete_walk_state(walk_state);
		goto cleanup;
		@@ -157,7 +157,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
		/* Execute the opcode and arguments */

		status = acpi_ds_init_aml_walk(walk_state, op, NULL, aml_start,
		aml_length, NULL, 3);
		aml_length, NULL, ACPI_IMODE_EXECUTE);
		if (ACPI_FAILURE(status)) {
		acpi_ds_delete_walk_state(walk_state);
		goto cleanup;

+1 −1

Original line number	Diff line number	Diff line
		@@ -754,7 +754,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
		}

		flags = ACPI_NS_NO_UPSEARCH;
		if (walk_state->pass_number == 3) {
		if (walk_state->pass_number == ACPI_IMODE_EXECUTE) {

		/* Execution mode, node cannot already exist, node is temporary */

+3 −3

Original line number	Diff line number	Diff line
		@@ -160,10 +160,10 @@ acpi_ns_parse_table(acpi_native_uint table_index,
		* each Parser Op subtree is deleted when it is finished. This saves
		* a great deal of memory, and allows a small cache of parse objects
		* to service the entire parse. The second pass of the parse then
		* performs another complete parse of the AML..
		* performs another complete parse of the AML.
		*/
		ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 1\n"));
		status = acpi_ns_one_complete_parse(1, table_index);
		status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1, table_index);
		if (ACPI_FAILURE(status)) {
		return_ACPI_STATUS(status);
		}
		@@ -178,7 +178,7 @@ acpi_ns_parse_table(acpi_native_uint table_index,
		* parse objects are all cached.
		*/
		ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 2\n"));
		status = acpi_ns_one_complete_parse(2, table_index);
		status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2, table_index);
		if (ACPI_FAILURE(status)) {
		return_ACPI_STATUS(status);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)

		/* Create and initialize a new walk state */

		info->pass_number = 3;
		info->pass_number = ACPI_IMODE_EXECUTE;
		walk_state =
		acpi_ds_create_walk_state(info->obj_desc->method.owner_id, NULL,
		NULL, NULL);