diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2019-03-25 14:34:01 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-26 17:39:39 -0400 |
commit | 2e018c59fe8fbc4ae1a8db1523ea0f6159f48b4b (patch) | |
tree | 621a45eddae51ad91c61234e8dd306af55fe0f7f /drivers/acpi/tables.c | |
parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff) |
ACPI / tables: Clean up whitespace
Cleanup some whitespace to match the rest of the file. No functional
change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/tables.c')
-rw-r--r-- | drivers/acpi/tables.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 8fccbe49612a..4672f9ef183a 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
@@ -240,8 +240,7 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) | |||
240 | * On success returns sum of all matching entries for all proc handlers. | 240 | * On success returns sum of all matching entries for all proc handlers. |
241 | * Otherwise, -ENODEV or -EINVAL is returned. | 241 | * Otherwise, -ENODEV or -EINVAL is returned. |
242 | */ | 242 | */ |
243 | static int __init | 243 | static int __init acpi_parse_entries_array(char *id, unsigned long table_size, |
244 | acpi_parse_entries_array(char *id, unsigned long table_size, | ||
245 | struct acpi_table_header *table_header, | 244 | struct acpi_table_header *table_header, |
246 | struct acpi_subtable_proc *proc, int proc_num, | 245 | struct acpi_subtable_proc *proc, int proc_num, |
247 | unsigned int max_entries) | 246 | unsigned int max_entries) |
@@ -314,8 +313,7 @@ acpi_parse_entries_array(char *id, unsigned long table_size, | |||
314 | return errs ? -EINVAL : count; | 313 | return errs ? -EINVAL : count; |
315 | } | 314 | } |
316 | 315 | ||
317 | int __init | 316 | int __init acpi_table_parse_entries_array(char *id, |
318 | acpi_table_parse_entries_array(char *id, | ||
319 | unsigned long table_size, | 317 | unsigned long table_size, |
320 | struct acpi_subtable_proc *proc, int proc_num, | 318 | struct acpi_subtable_proc *proc, int proc_num, |
321 | unsigned int max_entries) | 319 | unsigned int max_entries) |
@@ -346,8 +344,7 @@ acpi_table_parse_entries_array(char *id, | |||
346 | return count; | 344 | return count; |
347 | } | 345 | } |
348 | 346 | ||
349 | int __init | 347 | int __init acpi_table_parse_entries(char *id, |
350 | acpi_table_parse_entries(char *id, | ||
351 | unsigned long table_size, | 348 | unsigned long table_size, |
352 | int entry_id, | 349 | int entry_id, |
353 | acpi_tbl_entry_handler handler, | 350 | acpi_tbl_entry_handler handler, |
@@ -362,8 +359,7 @@ acpi_table_parse_entries(char *id, | |||
362 | max_entries); | 359 | max_entries); |
363 | } | 360 | } |
364 | 361 | ||
365 | int __init | 362 | int __init acpi_table_parse_madt(enum acpi_madt_type id, |
366 | acpi_table_parse_madt(enum acpi_madt_type id, | ||
367 | acpi_tbl_entry_handler handler, unsigned int max_entries) | 363 | acpi_tbl_entry_handler handler, unsigned int max_entries) |
368 | { | 364 | { |
369 | return acpi_table_parse_entries(ACPI_SIG_MADT, | 365 | return acpi_table_parse_entries(ACPI_SIG_MADT, |
@@ -725,8 +721,7 @@ static void *amlcode __attribute__ ((weakref("AmlCode"))); | |||
725 | static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); | 721 | static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); |
726 | #endif | 722 | #endif |
727 | 723 | ||
728 | acpi_status | 724 | acpi_status acpi_os_table_override(struct acpi_table_header *existing_table, |
729 | acpi_os_table_override(struct acpi_table_header *existing_table, | ||
730 | struct acpi_table_header **new_table) | 725 | struct acpi_table_header **new_table) |
731 | { | 726 | { |
732 | if (!existing_table || !new_table) | 727 | if (!existing_table || !new_table) |
@@ -788,7 +783,6 @@ static int __init acpi_parse_apic_instance(char *str) | |||
788 | 783 | ||
789 | return 0; | 784 | return 0; |
790 | } | 785 | } |
791 | |||
792 | early_param("acpi_apic_instance", acpi_parse_apic_instance); | 786 | early_param("acpi_apic_instance", acpi_parse_apic_instance); |
793 | 787 | ||
794 | static int __init acpi_force_table_verification_setup(char *s) | 788 | static int __init acpi_force_table_verification_setup(char *s) |
@@ -797,7 +791,6 @@ static int __init acpi_force_table_verification_setup(char *s) | |||
797 | 791 | ||
798 | return 0; | 792 | return 0; |
799 | } | 793 | } |
800 | |||
801 | early_param("acpi_force_table_verification", acpi_force_table_verification_setup); | 794 | early_param("acpi_force_table_verification", acpi_force_table_verification_setup); |
802 | 795 | ||
803 | static int __init acpi_force_32bit_fadt_addr(char *s) | 796 | static int __init acpi_force_32bit_fadt_addr(char *s) |
@@ -807,5 +800,4 @@ static int __init acpi_force_32bit_fadt_addr(char *s) | |||
807 | 800 | ||
808 | return 0; | 801 | return 0; |
809 | } | 802 | } |
810 | |||
811 | early_param("acpi_force_32bit_fadt_addr", acpi_force_32bit_fadt_addr); | 803 | early_param("acpi_force_32bit_fadt_addr", acpi_force_32bit_fadt_addr); |