Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / acpi / processor_core.c

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index ef58f46..342942f 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -125,13 +125,12 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
        }
 
        header = (struct acpi_subtable_header *)obj->buffer.pointer;
-       if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
+       if (header->type == ACPI_MADT_TYPE_LOCAL_APIC)
                map_lapic_id(header, acpi_id, &apic_id);
-       } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
+       else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC)
                map_lsapic_id(header, type, acpi_id, &apic_id);
-       } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
+       else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC)
                map_x2apic_id(header, type, acpi_id, &apic_id);
-       }
 
 exit:
        kfree(buffer.pointer);
@@ -164,7 +163,7 @@ int acpi_map_cpuid(int apic_id, u32 acpi_id)
                 * For example,
                 *
                 * Scope (_PR)
-                 * {
+                * {
                 *     Processor (CPU0, 0x00, 0x00000410, 0x06) {}
                 *     Processor (CPU1, 0x01, 0x00000410, 0x06) {}
                 *     Processor (CPU2, 0x02, 0x00000410, 0x06) {}