4 files changed, 25 insertions, 25 deletions

diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index b83dc32a5ae0..40b04bd5579e 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -104,8 +104,8 @@ acpi_ns_walk_namespace(acpi_object_type type,
                        acpi_handle start_object,
                        u32 max_depth,
                        u32 flags,
-                       acpi_walk_callback pre_order_visit,
-                       acpi_walk_callback post_order_visit,
+                       acpi_walk_callback descending_callback,
+                       acpi_walk_callback ascending_callback,
                        void *context, void **return_value);
 
 struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index e70911a9e441..e81f15ef659a 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -156,9 +156,9 @@ struct acpi_namespace_node *acpi_ns_get_next_node_typed(acpi_object_type type,
  *              max_depth           - Depth to which search is to reach
  *              flags               - Whether to unlock the NS before invoking
  *                                    the callback routine
- *              pre_order_visit     - Called during tree pre-order visit
+ *              descending_callback - Called during tree descent
  *                                    when an object of "Type" is found
- *              post_order_visit    - Called during tree post-order visit
+ *              ascending_callback  - Called during tree ascent
  *                                    when an object of "Type" is found
  *              context             - Passed to user function(s) above
  *              return_value        - from the user_function if terminated
@@ -185,8 +185,8 @@ acpi_ns_walk_namespace(acpi_object_type type,
                        acpi_handle start_node,
                        u32 max_depth,
                        u32 flags,
-                       acpi_walk_callback pre_order_visit,
-                       acpi_walk_callback post_order_visit,
+                       acpi_walk_callback descending_callback,
+                       acpi_walk_callback ascending_callback,
                        void *context, void **return_value)
 {
         acpi_status status;
@@ -255,22 +255,22 @@ acpi_ns_walk_namespace(acpi_object_type type,
                         }
 
                         /*
-                         * Invoke the user function, either pre-order or post-order
+                         * Invoke the user function, either descending, ascending,
                          * or both.
                          */
                         if (!node_previously_visited) {
-                                if (pre_order_visit) {
+                                if (descending_callback) {
                                         status =
-                                            pre_order_visit(child_node, level,
-                                                            context,
-                                                            return_value);
+                                            descending_callback(child_node,
+                                                                level, context,
+                                                                return_value);
                                 }
                         } else {
-                                if (post_order_visit) {
+                                if (ascending_callback) {
                                         status =
-                                            post_order_visit(child_node, level,
-                                                             context,
-                                                             return_value);
+                                            ascending_callback(child_node,
+                                                               level, context,
+                                                               return_value);
                                 }
                         }
 
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index f553cfdb71dd..b38b4b07f86e 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -533,9 +533,9 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)
  * PARAMETERS:  type                - acpi_object_type to search for
  *              start_object        - Handle in namespace where search begins
  *              max_depth           - Depth to which search is to reach
- *              pre_order_visit     - Called during tree pre-order visit
+ *              descending_callback - Called during tree descent
  *                                    when an object of "Type" is found
- *              post_order_visit    - Called during tree post-order visit
+ *              ascending_callback  - Called during tree ascent
  *                                    when an object of "Type" is found
  *              context             - Passed to user function(s) above
  *              return_value        - Location where return value of
@@ -563,8 +563,8 @@ acpi_status
 acpi_walk_namespace(acpi_object_type type,
                     acpi_handle start_object,
                     u32 max_depth,
-                    acpi_walk_callback pre_order_visit,
-                    acpi_walk_callback post_order_visit,
+                    acpi_walk_callback descending_callback,
+                    acpi_walk_callback ascending_callback,
                     void *context, void **return_value)
 {
         acpi_status status;
@@ -574,7 +574,7 @@ acpi_walk_namespace(acpi_object_type type,
         /* Parameter validation */
 
         if ((type > ACPI_TYPE_LOCAL_MAX) ||
-            (!max_depth) || (!pre_order_visit && !post_order_visit)) {
+            (!max_depth) || (!descending_callback && !ascending_callback)) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -606,9 +606,9 @@ acpi_walk_namespace(acpi_object_type type,
         }
 
         status = acpi_ns_walk_namespace(type, start_object, max_depth,
-                                        ACPI_NS_WALK_UNLOCK, pre_order_visit,
-                                        post_order_visit, context,
-                                        return_value);
+                                        ACPI_NS_WALK_UNLOCK,
+                                        descending_callback, ascending_callback,
+                                        context, return_value);
 
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 0dd03f226a68..e53f16a07237 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -212,8 +212,8 @@ acpi_status
 acpi_walk_namespace(acpi_object_type type,
                     acpi_handle start_object,
                     u32 max_depth,
-                    acpi_walk_callback pre_order_visit,
-                    acpi_walk_callback post_order_visit,
+                    acpi_walk_callback descending_callback,
+                    acpi_walk_callback ascending_callback,
                     void *context, void **return_value);
 
 acpi_status