1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index ddc84af6336e..e611dd961b20 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -93,7 +93,7 @@ acpi_get_handle(acpi_handle parent,
         /* Convert a parent handle to a prefix node */
 
         if (parent) {
-                prefix_node = acpi_ns_map_handle_to_node(parent);
+                prefix_node = acpi_ns_validate_handle(parent);
                 if (!prefix_node) {
                         return (AE_BAD_PARAMETER);
                 }
@@ -114,7 +114,7 @@ acpi_get_handle(acpi_handle parent,
 
                 if (!ACPI_STRCMP(pathname, ACPI_NS_ROOT_PATH)) {
                         *ret_handle =
-                            acpi_ns_convert_entry_to_handle(acpi_gbl_root_node);
+                            ACPI_CAST_PTR(acpi_handle, acpi_gbl_root_node);
                         return (AE_OK);
                 }
         } else if (!prefix_node) {
@@ -129,7 +129,7 @@ acpi_get_handle(acpi_handle parent,
         status =
             acpi_ns_get_node(prefix_node, pathname, ACPI_NS_NO_UPSEARCH, &node);
         if (ACPI_SUCCESS(status)) {
-                *ret_handle = acpi_ns_convert_entry_to_handle(node);
+                *ret_handle = ACPI_CAST_PTR(acpi_handle, node);
         }
 
         return (status);
@@ -186,7 +186,7 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
                 return (status);
         }
 
-        node = acpi_ns_map_handle_to_node(handle);
+        node = acpi_ns_validate_handle(handle);
         if (!node) {
                 status = AE_BAD_PARAMETER;
                 goto unlock_and_exit;
@@ -291,7 +291,7 @@ acpi_get_object_info(acpi_handle handle,
                 goto cleanup;
         }
 
-        node = acpi_ns_map_handle_to_node(handle);
+        node = acpi_ns_validate_handle(handle);
         if (!node) {
                 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
                 return (AE_BAD_PARAMETER);