diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2018-12-13 21:30:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-13 22:40:51 +0100 |
| commit | 178a0f6379698a4e23ad077c9a71dc84ee69d3a9 (patch) | |
| tree | 6b5e2298d24db966c064fae5dfccd73e71669674 /drivers/acpi/acpica/dswload.c | |
| parent | ACPICA: Add "Windows 2018" string in the _OSI support (diff) | |
| download | linux-178a0f6379698a4e23ad077c9a71dc84ee69d3a9.tar.xz linux-178a0f6379698a4e23ad077c9a71dc84ee69d3a9.zip | |
ACPICA: Remove defines that use deprecated flag
This commit removes the use of ACPI_NO_METHOD_EXECUTE flag
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/dswload.c')
| -rw-r--r-- | drivers/acpi/acpica/dswload.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c index d06c41446282..e2ef09643d50 100644 --- a/drivers/acpi/acpica/dswload.c +++ b/drivers/acpi/acpica/dswload.c @@ -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) { |