ACPICA: Performance enhancement for namespace search and access

[deliverable/linux.git] / drivers / acpi / acpica / nssearch.c

diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index a8e42b5e9463a8c0d99cc7686de85e88a1512ba9..41102a84272ffd0021f54e9541f14505dbe7b085 100644 (file)
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -152,17 +152,6 @@ acpi_ns_search_one_scope(u32 target_name,
                        return_ACPI_STATUS(AE_OK);
                }
 
-               /*
-                * The last entry in the list points back to the parent,
-                * so a flag is used to indicate the end-of-list
-                */
-               if (node->flags & ANOBJ_END_OF_PEER_LIST) {
-
-                       /* Searched entire list, we are done */
-
-                       break;
-               }
-
                /* Didn't match name, move on to the next peer object */
 
                node = node->peer;
@@ -217,7 +206,7 @@ acpi_ns_search_parent_tree(u32 target_name,
 
        ACPI_FUNCTION_TRACE(ns_search_parent_tree);
 
-       parent_node = acpi_ns_get_parent_node(node);
+       parent_node = node->parent;
 
        /*
         * If there is no parent (i.e., we are at the root) or type is "local",
@@ -261,7 +250,7 @@ acpi_ns_search_parent_tree(u32 target_name,
 
                /* Not found here, go up another level (until we reach the root) */
 
-               parent_node = acpi_ns_get_parent_node(parent_node);
+               parent_node = parent_node->parent;
        }
 
        /* Not found in parent tree */