3 files changed, 5 insertions, 4 deletions

diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index aa60dca1f8aa..57c5159b261c 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -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)) {
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 5b974a8fe614..26035a3a32d8 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -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;
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 4ed08680ae7c..baf04e883177 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -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 */