5 files changed, 9 insertions, 8 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 */
 
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 2e224796d56f..a68de26c7d38 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -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);
         }
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 9069c697cf1d..fc5b3e5645e4 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -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);