Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 178a0f63 authored by Erik Schmauss's avatar Erik Schmauss Committed by Rafael J. Wysocki
Browse files

ACPICA: Remove defines that use deprecated flag 



This commit removes the use of ACPI_NO_METHOD_EXECUTE flag

Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2db90876

drivers/acpi/acpica/acglobal.h

+0 −4
Original line number Diff line number Diff line
@@ -172,11 +172,7 @@ ACPI_GLOBAL(u8, acpi_gbl_disable_mem_tracking); 
 *

 ****************************************************************************/



#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)

#define NUM_PREDEFINED_NAMES            10

#else

#define NUM_PREDEFINED_NAMES            9

#endif



ACPI_GLOBAL(struct acpi_namespace_node, acpi_gbl_root_node_struct);

ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_root_node);

drivers/acpi/acpica/dsobject.c

+0 −11
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define _COMPONENT          ACPI_DISPATCHER

ACPI_MODULE_NAME("dsobject")



#ifndef ACPI_NO_METHOD_EXECUTION

/*******************************************************************************

 *

 * FUNCTION:    acpi_ds_build_internal_object
@@ -299,8 +298,6 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state, 
	return_ACPI_STATUS(status);

}



#endif				/* ACPI_NO_METHOD_EXECUTION */



/*******************************************************************************

 *

 * FUNCTION:    acpi_ds_init_object_from_op
@@ -404,9 +401,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 


				/* Truncate value if we are executing from a 32-bit ACPI table */



#ifndef ACPI_NO_METHOD_EXECUTION

				(void)acpi_ex_truncate_for32bit_table(obj_desc);

#endif

				break;



			case AML_REVISION_OP:
@@ -428,7 +423,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 


			obj_desc->integer.value = op->common.value.integer;



#ifndef ACPI_NO_METHOD_EXECUTION

			if (acpi_ex_truncate_for32bit_table(obj_desc)) {



				/* Warn if we found a 64-bit constant in a 32-bit table */
@@ -439,7 +433,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
								 value.integer),

					      (u32)obj_desc->integer.value));

			}

#endif

			break;



		default:
@@ -477,7 +470,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
			    ((u32)opcode) - AML_FIRST_LOCAL_OP;

			obj_desc->reference.class = ACPI_REFCLASS_LOCAL;



#ifndef ACPI_NO_METHOD_EXECUTION

			status =

			    acpi_ds_method_data_get_node(ACPI_REFCLASS_LOCAL,

							 obj_desc->reference.
@@ -487,7 +479,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
							  acpi_namespace_node,

							  &obj_desc->reference.

							  object));

#endif

			break;



		case AML_TYPE_METHOD_ARGUMENT:
@@ -498,7 +489,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
			    ((u32)opcode) - AML_FIRST_ARG_OP;

			obj_desc->reference.class = ACPI_REFCLASS_ARG;



#ifndef ACPI_NO_METHOD_EXECUTION

			status = acpi_ds_method_data_get_node(ACPI_REFCLASS_ARG,

							      obj_desc->

							      reference.value,
@@ -509,7 +499,6 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, 
							       &obj_desc->

							       reference.

							       object));

#endif

			break;



		default:	/* Object name or Debug object */

drivers/acpi/acpica/dsutils.c

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state) 
	}

}



#ifndef ACPI_NO_METHOD_EXECUTION

/*******************************************************************************

 *

 * FUNCTION:    acpi_ds_do_implicit_return
@@ -401,7 +400,6 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state) 
	walk_state->num_operands = 0;

	return_VOID;

}

#endif



/*******************************************************************************

 *

drivers/acpi/acpica/dswload.c

+1 −5
Original line number Diff line number Diff line
@@ -73,12 +73,10 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number) 


		/* Execution pass */



#ifndef ACPI_NO_METHOD_EXECUTION

		walk_state->parse_flags |= ACPI_PARSE_EXECUTE |

		    ACPI_PARSE_DELETE_TREE;

		walk_state->descending_callback = acpi_ds_exec_begin_op;

		walk_state->ascending_callback = acpi_ds_exec_end_op;

#endif

		break;



	default:
@@ -364,7 +362,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state, 


	/* Initialize the op */



#if (defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY))

#ifdef ACPI_CONSTANT_EVAL_ONLY

	op->named.path = path;

#endif
@@ -422,7 +420,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state) 


	object_type = walk_state->op_info->object_type;



#ifndef ACPI_NO_METHOD_EXECUTION

	if (walk_state->op_info->flags & AML_FIELD) {

		/*

		 * If we are executing a method, do not create any namespace objects
@@ -466,7 +463,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state) 
			}

		}

	}

#endif



	if (op->common.aml_opcode == AML_NAME_OP) {

drivers/acpi/acpica/dswload2.c

+0 −7
Original line number Diff line number Diff line
@@ -371,10 +371,8 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
	struct acpi_namespace_node *node;

	union acpi_parse_object *arg;

	struct acpi_namespace_node *new_node;

#ifndef ACPI_NO_METHOD_EXECUTION

	u32 i;

	u8 region_space;

#endif



	ACPI_FUNCTION_TRACE(ds_load2_end_op);
@@ -461,7 +459,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
	arg = op->common.value.arg;



	switch (walk_state->op_info->type) {

#ifndef ACPI_NO_METHOD_EXECUTION



	case AML_TYPE_CREATE_FIELD:

		/*
@@ -558,12 +555,10 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
		}



		break;

#endif				/* ACPI_NO_METHOD_EXECUTION */



	case AML_TYPE_NAMED_COMPLEX:



		switch (op->common.aml_opcode) {

#ifndef ACPI_NO_METHOD_EXECUTION

		case AML_REGION_OP:

		case AML_DATA_REGION_OP:
@@ -651,8 +646,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
			}

			break;



#endif				/* ACPI_NO_METHOD_EXECUTION */



		default:



			/* All NAMED_COMPLEX opcodes must be handled above */