ACPICA: Rename nameseg copy macro for clarity

ACPICA commit 19c18d3157945d1b8b64a826f0a8e848b7dbb127

ACPI_MOVE_NAME changed to ACPI_COPY_NAMESEG
This clarifies (1) this is a copy operation, and
(2) it operates on ACPI name_segs.
Improves understanding of the code.

Link: https://github.com/acpica/acpica/commit/19c18d31
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index 289c15bb8c6a96acbe1ab95d1d8e2e612819bfb8..c384320a0f269c45d556faf294e6487cded17546 100644 (file)
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -108,7 +108,7 @@ acpi_ns_handle_to_name(acpi_handle target_handle, struct acpi_buffer *buffer)
        /* Just copy the ACPI name from the Node and zero terminate it */
 
        node_name = acpi_ut_get_node_name(node);
-       ACPI_MOVE_NAME(buffer->pointer, node_name);
+       ACPI_COPY_NAMESEG(buffer->pointer, node_name);
        ((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
 
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%4.4s\n", (char *)buffer->pointer));

diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index e5cef1edf49faf6b6e3384bc4f7010be79534846..6f5940b02a4f03c37b46ee92c62cda56211ba2ac 100644 (file)
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -489,8 +489,8 @@ acpi_ns_externalize_name(u32 internal_name_length,
 
                        /* Copy and validate the 4-char name segment */
 
-                       ACPI_MOVE_NAME(&(*converted_name)[j],
-                                      &internal_name[names_index]);
+                       ACPI_COPY_NAMESEG(&(*converted_name)[j],
+                                         &internal_name[names_index]);
                        acpi_ut_repair_name(&(*converted_name)[j]);
 
                        j += ACPI_NAME_SIZE;

diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 951bd8e1c50a6668393cbf5f86e9934f86e9d356..ddc88aaca376432b21e4b88bdafa6116b09d7e66 100644 (file)
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -56,7 +56,7 @@ acpi_tb_find_table(char *signature,
        /* Normalize the input strings */
 
        memset(&header, 0, sizeof(struct acpi_table_header));
-       ACPI_MOVE_NAME(header.signature, signature);
+       ACPI_COPY_NAMESEG(header.signature, signature);
        strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
        strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
 

diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c
index 5bef0b0594062fc76195e96dfd9aa09f58bc99a5..89dc79798d385f0d9339279e1c8d700523934e98 100644 (file)
--- a/drivers/acpi/acpica/utstring.c
+++ b/drivers/acpi/acpica/utstring.c
@@ -145,7 +145,7 @@ void acpi_ut_repair_name(char *name)
                return;
        }
 
-       ACPI_MOVE_NAME(&original_name, name);
+       ACPI_COPY_NAMESEG(&original_name, name);
 
        /* Check each character in the name */
 

diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index f73382e82c26b46839375e71ec3162842238b0f3..bfe54189f242e961d3dd925380f6302ff888a3b5 100644 (file)
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -516,10 +516,10 @@ typedef u64 acpi_integer;
 
 #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
 #define ACPI_COMPARE_NAME(a,b)          (*ACPI_CAST_PTR (u32, (a)) == *ACPI_CAST_PTR (u32, (b)))
-#define ACPI_MOVE_NAME(dest,src)        (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))
+#define ACPI_COPY_NAMESEG(dest,src)     (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))
 #else
 #define ACPI_COMPARE_NAME(a,b)          (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE))
-#define ACPI_MOVE_NAME(dest,src)        (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
+#define ACPI_COPY_NAMESEG(dest,src)     (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
 #endif
 
 /* Support for the special RSDP signature (8 characters) */

diff --git a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
index 2a1fd9182f94d1a2f8d88f37d846a1af4f737eb0..587b701a7edb63dd30d995e2d91ad0ef97c8f7dc 100644 (file)
--- a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
+++ b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
@@ -286,7 +286,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance)
                return (AE_NO_MEMORY);
        }
 
-       ACPI_MOVE_NAME(new_info->signature, signature);
+       ACPI_COPY_NAMESEG(new_info->signature, signature);
 
        if (!gbl_table_list_head) {
                gbl_table_list_head = new_info;
@@ -1174,7 +1174,7 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
 
        /* Extract signature */
 
-       ACPI_MOVE_NAME(signature, filename);
+       ACPI_COPY_NAMESEG(signature, filename);
        return (AE_OK);
 }
 

diff --git a/tools/power/acpi/tools/acpidump/apfiles.c b/tools/power/acpi/tools/acpidump/apfiles.c
index 49972bc78bc5e893976952801785b74933692990..8abc8f998abd74cba0db67958ccc6fac67e75f70 100644 (file)
--- a/tools/power/acpi/tools/acpidump/apfiles.c
+++ b/tools/power/acpi/tools/acpidump/apfiles.c
@@ -110,9 +110,9 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
        /* Construct lower-case filename from the table local signature */
 
        if (ACPI_VALIDATE_RSDP_SIG(table->signature)) {
-               ACPI_MOVE_NAME(filename, ACPI_RSDP_NAME);
+               ACPI_COPY_NAMESEG(filename, ACPI_RSDP_NAME);
        } else {
-               ACPI_MOVE_NAME(filename, table->signature);
+               ACPI_COPY_NAMESEG(filename, table->signature);
        }
 
        filename[0] = (char)tolower((int)filename[0]);