ACPICA: Debugger: reduce old external path format

ACPICA commit 75c0da9e796bdf9bdd46d75f028a3e1779903214

In the error logs and debugger outputs, use new external path format that
does not contain a trailing underscore.

This patch takes care of acpi_ns_get_external_pathname() invocations, chaning
them into acpi_ns_get_normalized_pathname(TRUE) where possible. Along with some
error log fixes, the following debugger commands are fixed: resources,
handlers, paths. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/75c0da9e
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/dbcmds.c b/drivers/acpi/acpica/dbcmds.c
index 30414b3d7fddd2d97f00bb796776ff4435d629a2..84ab1c2faa0475adb9a84eebb43997b64300c82e 100644 (file)
--- a/drivers/acpi/acpica/dbcmds.c
+++ b/drivers/acpi/acpica/dbcmds.c
@@ -798,7 +798,7 @@ acpi_db_device_resources(acpi_handle obj_handle,
        acpi_status status;
 
        node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);
-       parent_path = acpi_ns_get_external_pathname(node);
+       parent_path = acpi_ns_get_normalized_pathname(node, TRUE);
        if (!parent_path) {
                return (AE_NO_MEMORY);
        }

diff --git a/drivers/acpi/acpica/dbdisply.c b/drivers/acpi/acpica/dbdisply.c
index c42ce8aa9dfe6255efb498f1fe3928400446eb98..3acc3a57ba1c12a0f45b69a41b6602259e32da3c 100644 (file)
--- a/drivers/acpi/acpica/dbdisply.c
+++ b/drivers/acpi/acpica/dbdisply.c
@@ -1091,7 +1091,7 @@ acpi_db_display_non_root_handlers(acpi_handle obj_handle,
                return (AE_OK);
        }
 
-       pathname = acpi_ns_get_external_pathname(node);
+       pathname = acpi_ns_get_normalized_pathname(node, TRUE);
        if (!pathname) {
                return (AE_OK);
        }

diff --git a/drivers/acpi/acpica/dbnames.c b/drivers/acpi/acpica/dbnames.c
index 04ff1ebfda5879f3207f29a1413509f567f46f57..4f68dfc6ea551f597589919dae64d740ef73c574 100644 (file)
--- a/drivers/acpi/acpica/dbnames.c
+++ b/drivers/acpi/acpica/dbnames.c
@@ -438,7 +438,7 @@ acpi_db_walk_for_predefined_names(acpi_handle obj_handle,
                return (AE_OK);
        }
 
-       pathname = acpi_ns_get_external_pathname(node);
+       pathname = acpi_ns_get_normalized_pathname(node, TRUE);
        if (!pathname) {
                return (AE_OK);
        }

diff --git a/drivers/acpi/acpica/dbtest.c b/drivers/acpi/acpica/dbtest.c
index 10ea8bf9b8101090c22d4e20dbcd3ce81ec93aac..68b4e8d9e1d6c42e189d374aed20963936194bad 100644 (file)
--- a/drivers/acpi/acpica/dbtest.c
+++ b/drivers/acpi/acpica/dbtest.c
@@ -953,7 +953,7 @@ acpi_db_evaluate_one_predefined_name(acpi_handle obj_handle,
                return (AE_OK);
        }
 
-       pathname = acpi_ns_get_external_pathname(node);
+       pathname = acpi_ns_get_normalized_pathname(node, TRUE);
        if (!pathname) {
                return (AE_OK);
        }

diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 37aa5c45ca4b1936dbf18a00a4c40537505c3e2f..e0719560bc33a366eff5299fb3618b3936bff31c 100644 (file)
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -717,7 +717,7 @@ acpi_ns_dump_one_object_path(acpi_handle obj_handle,
                return (AE_OK);
        }
 
-       pathname = acpi_ns_get_external_pathname(node);
+       pathname = acpi_ns_get_normalized_pathname(node, TRUE);
 
        path_indent = 1;
        if (level <= max_level) {

diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index 7eba578d36f36d91443f706cd32eb5050b841a13..15e0b2ec5d659f0874876c5ab4e154fd298dcc51 100644 (file)
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -135,7 +135,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
 
        /* Get the full pathname to the object, for use in warning messages */
 
-       info->full_pathname = acpi_ns_get_external_pathname(info->node);
+       info->full_pathname = acpi_ns_get_normalized_pathname(info->node, TRUE);
        if (!info->full_pathname) {
                return_ACPI_STATUS(AE_NO_MEMORY);
        }

diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 656eacfeac56abe0c0d4c3acd04bfb0472125e0f..ac59929c3ee947bbb3a527b8e13cb0a7f4e87cf9 100644 (file)
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -582,7 +582,8 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
 
                /* Ignore error and move on to next device */
 
-               char *scope_name = acpi_ns_get_external_pathname(device_node);
+               char *scope_name =
+                   acpi_ns_get_normalized_pathname(device_node, TRUE);
 
                ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution",
                                scope_name));

diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index d7390401383043d7af82cf51233cdfea4f825566..9cc3564de37ed03e6ea8d01962db55f045ba4b2a 100644 (file)
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -105,7 +105,7 @@ acpi_ns_search_one_scope(u32 target_name,
        if (ACPI_LV_NAMES & acpi_dbg_level) {
                char *scope_name;
 
-               scope_name = acpi_ns_get_external_pathname(parent_node);
+               scope_name = acpi_ns_get_normalized_pathname(parent_node, TRUE);
                if (scope_name) {
                        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                          "Searching %s (%p) For [%4.4s] (%s)\n",

diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
index 911ea8e7fe8700f451cef7b2597b82c30870ca8f..38a29e235b74435e4c4764205e1abd2f2fbecf37 100644 (file)
--- a/drivers/acpi/acpica/utaddress.c
+++ b/drivers/acpi/acpica/utaddress.c
@@ -239,8 +239,9 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
                        overlap_count++;
                        if (warn) {     /* Optional warning message */
                                pathname =
-                                   acpi_ns_get_external_pathname(range_info->
-                                                                 region_node);
+                                   acpi_ns_get_normalized_pathname(range_info->
+                                                                   region_node,
+                                                                   TRUE);
 
                                ACPI_WARNING((AE_INFO,
                                              "%s range 0x%8.8X%8.8X-0x%8.8X%8.8X conflicts with OpRegion 0x%8.8X%8.8X-0x%8.8X%8.8X (%s)",