diff options
Diffstat (limited to 'drivers/acpi/acpica/nsutils.c')
-rw-r--r-- | drivers/acpi/acpica/nsutils.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c index d30b0e65ab3c..78277ed08339 100644 --- a/drivers/acpi/acpica/nsutils.c +++ b/drivers/acpi/acpica/nsutils.c | |||
@@ -325,9 +325,8 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info) | |||
325 | next_external_char++; | 325 | next_external_char++; |
326 | } | 326 | } |
327 | } else { | 327 | } else { |
328 | /* | 328 | /* Handle Carat prefixes */ |
329 | * Handle Carat prefixes | 329 | |
330 | */ | ||
331 | while (*next_external_char == '^') { | 330 | while (*next_external_char == '^') { |
332 | info->num_carats++; | 331 | info->num_carats++; |
333 | next_external_char++; | 332 | next_external_char++; |
@@ -552,9 +551,8 @@ acpi_ns_externalize_name(u32 internal_name_length, | |||
552 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 551 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
553 | } | 552 | } |
554 | 553 | ||
555 | /* | 554 | /* Check for a prefix (one '\' | one or more '^') */ |
556 | * Check for a prefix (one '\' | one or more '^'). | 555 | |
557 | */ | ||
558 | switch (internal_name[0]) { | 556 | switch (internal_name[0]) { |
559 | case '\\': | 557 | case '\\': |
560 | prefix_length = 1; | 558 | prefix_length = 1; |
@@ -580,7 +578,7 @@ acpi_ns_externalize_name(u32 internal_name_length, | |||
580 | } | 578 | } |
581 | 579 | ||
582 | /* | 580 | /* |
583 | * Check for object names. Note that there could be 0-255 of these | 581 | * Check for object names. Note that there could be 0-255 of these |
584 | * 4-byte elements. | 582 | * 4-byte elements. |
585 | */ | 583 | */ |
586 | if (prefix_length < internal_name_length) { | 584 | if (prefix_length < internal_name_length) { |
@@ -637,9 +635,8 @@ acpi_ns_externalize_name(u32 internal_name_length, | |||
637 | return_ACPI_STATUS(AE_BAD_PATHNAME); | 635 | return_ACPI_STATUS(AE_BAD_PATHNAME); |
638 | } | 636 | } |
639 | 637 | ||
640 | /* | 638 | /* Build the converted_name */ |
641 | * Build converted_name | 639 | |
642 | */ | ||
643 | *converted_name = ACPI_ALLOCATE_ZEROED(required_length); | 640 | *converted_name = ACPI_ALLOCATE_ZEROED(required_length); |
644 | if (!(*converted_name)) { | 641 | if (!(*converted_name)) { |
645 | return_ACPI_STATUS(AE_NO_MEMORY); | 642 | return_ACPI_STATUS(AE_NO_MEMORY); |
@@ -685,6 +682,9 @@ acpi_ns_externalize_name(u32 internal_name_length, | |||
685 | * and keep all pointers within this subsystem - however this introduces | 682 | * and keep all pointers within this subsystem - however this introduces |
686 | * more (and perhaps unnecessary) overhead. | 683 | * more (and perhaps unnecessary) overhead. |
687 | * | 684 | * |
685 | * The current implemenation is basically a placeholder until such time comes | ||
686 | * that it is needed. | ||
687 | * | ||
688 | ******************************************************************************/ | 688 | ******************************************************************************/ |
689 | 689 | ||
690 | struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle) | 690 | struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle) |
@@ -692,9 +692,8 @@ struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle) | |||
692 | 692 | ||
693 | ACPI_FUNCTION_ENTRY(); | 693 | ACPI_FUNCTION_ENTRY(); |
694 | 694 | ||
695 | /* | 695 | /* Parameter validation */ |
696 | * Simple implementation | 696 | |
697 | */ | ||
698 | if ((!handle) || (handle == ACPI_ROOT_OBJECT)) { | 697 | if ((!handle) || (handle == ACPI_ROOT_OBJECT)) { |
699 | return (acpi_gbl_root_node); | 698 | return (acpi_gbl_root_node); |
700 | } | 699 | } |