Merge tag 'driver-core-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / acpi / tables.c

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 3d0da38..3b5d04f 100644 (file)
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -294,8 +294,7 @@ acpi_get_subtable_type(char *id)
  * On success returns sum of all matching entries for all proc handlers.
  * Otherwise, -ENODEV or -EINVAL is returned.
  */
-static int __init
-acpi_parse_entries_array(char *id, unsigned long table_size,
+static int __init acpi_parse_entries_array(char *id, unsigned long table_size,
                struct acpi_table_header *table_header,
                struct acpi_subtable_proc *proc, int proc_num,
                unsigned int max_entries)
@@ -370,8 +369,7 @@ acpi_parse_entries_array(char *id, unsigned long table_size,
        return errs ? -EINVAL : count;
 }
 
-int __init
-acpi_table_parse_entries_array(char *id,
+int __init acpi_table_parse_entries_array(char *id,
                         unsigned long table_size,
                         struct acpi_subtable_proc *proc, int proc_num,
                         unsigned int max_entries)
@@ -402,8 +400,7 @@ acpi_table_parse_entries_array(char *id,
        return count;
 }
 
-int __init
-acpi_table_parse_entries(char *id,
+int __init acpi_table_parse_entries(char *id,
                        unsigned long table_size,
                        int entry_id,
                        acpi_tbl_entry_handler handler,
@@ -418,8 +415,7 @@ acpi_table_parse_entries(char *id,
                                                max_entries);
 }
 
-int __init
-acpi_table_parse_madt(enum acpi_madt_type id,
+int __init acpi_table_parse_madt(enum acpi_madt_type id,
                      acpi_tbl_entry_handler handler, unsigned int max_entries)
 {
        return acpi_table_parse_entries(ACPI_SIG_MADT,
@@ -726,8 +722,8 @@ static void __init acpi_table_initrd_scan(void)
                table_length = table->length;
 
                /* Skip RSDT/XSDT which should only be used for override */
-               if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_RSDT) ||
-                   ACPI_COMPARE_NAME(table->signature, ACPI_SIG_XSDT)) {
+               if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_RSDT) ||
+                   ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_XSDT)) {
                        acpi_os_unmap_memory(table, ACPI_HEADER_SIZE);
                        goto next_table;
                }
@@ -781,8 +777,7 @@ static void *amlcode __attribute__ ((weakref("AmlCode")));
 static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code")));
 #endif
 
-acpi_status
-acpi_os_table_override(struct acpi_table_header *existing_table,
+acpi_status acpi_os_table_override(struct acpi_table_header *existing_table,
                       struct acpi_table_header **new_table)
 {
        if (!existing_table || !new_table)
@@ -844,7 +839,6 @@ static int __init acpi_parse_apic_instance(char *str)
 
        return 0;
 }
-
 early_param("acpi_apic_instance", acpi_parse_apic_instance);
 
 static int __init acpi_force_table_verification_setup(char *s)
@@ -853,7 +847,6 @@ static int __init acpi_force_table_verification_setup(char *s)
 
        return 0;
 }
-
 early_param("acpi_force_table_verification", acpi_force_table_verification_setup);
 
 static int __init acpi_force_32bit_fadt_addr(char *s)
@@ -863,5 +856,4 @@ static int __init acpi_force_32bit_fadt_addr(char *s)
 
        return 0;
 }
-
 early_param("acpi_force_32bit_fadt_addr", acpi_force_32bit_fadt_addr);