1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 3a2814676ac3..0cd925be5fc1 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -338,8 +338,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                          */
                         while (!acpi_ns_opens_scope(prefix_node->type) &&
                                prefix_node->type != ACPI_TYPE_ANY) {
-                                prefix_node =
-                                    acpi_ns_get_parent_node(prefix_node);
+                                prefix_node = prefix_node->parent;
                         }
                 }
         }
@@ -419,7 +418,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                                 /* Backup to the parent node */
 
                                 num_carats++;
-                                this_node = acpi_ns_get_parent_node(this_node);
+                                this_node = this_node->parent;
                                 if (!this_node) {
 
                                         /* Current scope has no parent scope */
@@ -433,7 +432,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
 
                         if (search_parent_flag == ACPI_NS_NO_UPSEARCH) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                                  "Search scope is [%4.4s], path has %d carat(s)\n",
+                                                  "Search scope is [%4.4s], path has %u carat(s)\n",
                                                   acpi_ut_get_node_name
                                                   (this_node), num_carats));
                         }
@@ -495,7 +494,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                         path++;
 
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "Multi Pathname (%d Segments, Flags=%X)\n",
+                                          "Multi Pathname (%u Segments, Flags=%X)\n",
                                           num_segments, flags));
                         break;