1 files changed, 15 insertions, 15 deletions

diff --git a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
index 587b701a7edb..2686d858225a 100644
--- a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
+++ b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
@@ -293,7 +293,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance)
         } else {
                 next = gbl_table_list_head;
                 while (1) {
-                        if (ACPI_COMPARE_NAME(next->signature, signature)) {
+                        if (ACPI_COMPARE_NAMESEG(next->signature, signature)) {
                                 if (next->instance == instance) {
                                         found = TRUE;
                                 }
@@ -782,11 +782,11 @@ osl_get_bios_table(char *signature,
 
         /* Handle special tables whose addresses are not in RSDT/XSDT */
 
-        if (ACPI_COMPARE_NAME(signature, ACPI_RSDP_NAME) ||
-            ACPI_COMPARE_NAME(signature, ACPI_SIG_RSDT) ||
-            ACPI_COMPARE_NAME(signature, ACPI_SIG_XSDT) ||
-            ACPI_COMPARE_NAME(signature, ACPI_SIG_DSDT) ||
-            ACPI_COMPARE_NAME(signature, ACPI_SIG_FACS)) {
+        if (ACPI_COMPARE_NAMESEG(signature, ACPI_RSDP_NAME) ||
+            ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_RSDT) ||
+            ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_XSDT) ||
+            ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_DSDT) ||
+            ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_FACS)) {
 
 find_next_instance:
 
@@ -797,7 +797,7 @@ find_next_instance:
                  * careful about the FADT length and validate table addresses.
                  * Note: The 64-bit addresses have priority.
                  */
-                if (ACPI_COMPARE_NAME(signature, ACPI_SIG_DSDT)) {
+                if (ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_DSDT)) {
                         if (current_instance < 2) {
                                 if ((gbl_fadt->header.length >=
                                      MIN_FADT_FOR_XDSDT) && gbl_fadt->Xdsdt
@@ -815,7 +815,7 @@ find_next_instance:
                                             dsdt;
                                 }
                         }
-                } else if (ACPI_COMPARE_NAME(signature, ACPI_SIG_FACS)) {
+                } else if (ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_FACS)) {
                         if (current_instance < 2) {
                                 if ((gbl_fadt->header.length >=
                                      MIN_FADT_FOR_XFACS) && gbl_fadt->Xfacs
@@ -833,7 +833,7 @@ find_next_instance:
                                             facs;
                                 }
                         }
-                } else if (ACPI_COMPARE_NAME(signature, ACPI_SIG_XSDT)) {
+                } else if (ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_XSDT)) {
                         if (!gbl_revision) {
                                 return (AE_BAD_SIGNATURE);
                         }
@@ -842,7 +842,7 @@ find_next_instance:
                                     (acpi_physical_address)gbl_rsdp.
                                     xsdt_physical_address;
                         }
-                } else if (ACPI_COMPARE_NAME(signature, ACPI_SIG_RSDT)) {
+                } else if (ACPI_COMPARE_NAMESEG(signature, ACPI_SIG_RSDT)) {
                         if (current_instance == 0) {
                                 table_address =
                                     (acpi_physical_address)gbl_rsdp.
@@ -931,7 +931,7 @@ find_next_instance:
 
                         /* Does this table match the requested signature? */
 
-                        if (!ACPI_COMPARE_NAME
+                        if (!ACPI_COMPARE_NAMESEG
                             (mapped_table->signature, signature)) {
                                 osl_unmap_table(mapped_table);
                                 mapped_table = NULL;
@@ -1086,8 +1086,8 @@ osl_map_table(acpi_size address,
                                 return (AE_BAD_SIGNATURE);
                         }
                 } else
-                    if (!ACPI_COMPARE_NAME(signature, mapped_table->signature))
-                {
+                    if (!ACPI_COMPARE_NAMESEG
+                        (signature, mapped_table->signature)) {
                         acpi_os_unmap_memory(mapped_table,
                                              sizeof(struct acpi_table_header));
                         return (AE_BAD_SIGNATURE);
@@ -1236,7 +1236,7 @@ osl_read_table_from_file(char *filename,
                                 status = AE_BAD_SIGNATURE;
                                 goto exit;
                         }
-                } else if (!ACPI_COMPARE_NAME(signature, header.signature)) {
+                } else if (!ACPI_COMPARE_NAMESEG(signature, header.signature)) {
                         fprintf(stderr,
                                 "Incorrect signature: Expecting %4.4s, found %4.4s\n",
                                 signature, header.signature);
@@ -1329,7 +1329,7 @@ osl_get_customized_table(char *pathname,
 
                 /* Ignore meaningless files */
 
-                if (!ACPI_COMPARE_NAME(filename, signature)) {
+                if (!ACPI_COMPARE_NAMESEG(filename, signature)) {
                         continue;
                 }