Commit d6742095 authored by Alex Chiang's avatar Alex Chiang Committed by Len Brown

ACPI: processor: refactor internal map_x2apic_id()

Untangle the nested if conditions to make this function look
more similar to the other map_*apic_id() functions.
Acked-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 11130736
...@@ -66,22 +66,16 @@ static int map_x2apic_id(struct acpi_subtable_header *entry, ...@@ -66,22 +66,16 @@ static int map_x2apic_id(struct acpi_subtable_header *entry,
{ {
struct acpi_madt_local_x2apic *apic = struct acpi_madt_local_x2apic *apic =
(struct acpi_madt_local_x2apic *)entry; (struct acpi_madt_local_x2apic *)entry;
u32 tmp = apic->local_apic_id;
/* Only check enabled APICs*/
if (!(apic->lapic_flags & ACPI_MADT_ENABLED)) if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
return 0; return 0;
/* Device statement declaration type */ if (device_declaration && (apic->uid == acpi_id)) {
if (device_declaration) { *apic_id = apic->local_apic_id;
if (apic->uid == acpi_id) return 1;
goto found;
} }
return 0; return 0;
found:
*apic_id = tmp;
return 1;
} }
static int map_lsapic_id(struct acpi_subtable_header *entry, static int map_lsapic_id(struct acpi_subtable_header *entry,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment