diff options
Diffstat (limited to 'drivers/acpi/acpica/nsxfeval.c')
-rw-r--r-- | drivers/acpi/acpica/nsxfeval.c | 16 |
1 files changed, 8 insertions, 8 deletions
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) | |||
533 | * PARAMETERS: type - acpi_object_type to search for | 533 | * PARAMETERS: type - acpi_object_type to search for |
534 | * start_object - Handle in namespace where search begins | 534 | * start_object - Handle in namespace where search begins |
535 | * max_depth - Depth to which search is to reach | 535 | * max_depth - Depth to which search is to reach |
536 | * pre_order_visit - Called during tree pre-order visit | 536 | * descending_callback - Called during tree descent |
537 | * when an object of "Type" is found | 537 | * when an object of "Type" is found |
538 | * post_order_visit - Called during tree post-order visit | 538 | * ascending_callback - Called during tree ascent |
539 | * when an object of "Type" is found | 539 | * when an object of "Type" is found |
540 | * context - Passed to user function(s) above | 540 | * context - Passed to user function(s) above |
541 | * return_value - Location where return value of | 541 | * return_value - Location where return value of |
@@ -563,8 +563,8 @@ acpi_status | |||
563 | acpi_walk_namespace(acpi_object_type type, | 563 | acpi_walk_namespace(acpi_object_type type, |
564 | acpi_handle start_object, | 564 | acpi_handle start_object, |
565 | u32 max_depth, | 565 | u32 max_depth, |
566 | acpi_walk_callback pre_order_visit, | 566 | acpi_walk_callback descending_callback, |
567 | acpi_walk_callback post_order_visit, | 567 | acpi_walk_callback ascending_callback, |
568 | void *context, void **return_value) | 568 | void *context, void **return_value) |
569 | { | 569 | { |
570 | acpi_status status; | 570 | acpi_status status; |
@@ -574,7 +574,7 @@ acpi_walk_namespace(acpi_object_type type, | |||
574 | /* Parameter validation */ | 574 | /* Parameter validation */ |
575 | 575 | ||
576 | if ((type > ACPI_TYPE_LOCAL_MAX) || | 576 | if ((type > ACPI_TYPE_LOCAL_MAX) || |
577 | (!max_depth) || (!pre_order_visit && !post_order_visit)) { | 577 | (!max_depth) || (!descending_callback && !ascending_callback)) { |
578 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 578 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
579 | } | 579 | } |
580 | 580 | ||
@@ -606,9 +606,9 @@ acpi_walk_namespace(acpi_object_type type, | |||
606 | } | 606 | } |
607 | 607 | ||
608 | status = acpi_ns_walk_namespace(type, start_object, max_depth, | 608 | status = acpi_ns_walk_namespace(type, start_object, max_depth, |
609 | ACPI_NS_WALK_UNLOCK, pre_order_visit, | 609 | ACPI_NS_WALK_UNLOCK, |
610 | post_order_visit, context, | 610 | descending_callback, ascending_callback, |
611 | return_value); | 611 | context, return_value); |
612 | 612 | ||
613 | (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); | 613 | (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); |
614 | 614 | ||