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: Venkatesh Pallipadi <[email protected]>
Signed-off-by: Alex Chiang <[email protected]>
Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Alex Chiang 2010-02-22 12:11:50 -07:00 • committed by Len Brown
commit d67420956b

View file

@ -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 *)entry;
u32 tmp = apic->local_apic_id;
/* Only check enabled APICs*/
if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
return 0;
/* Device statement declaration type */
if (device_declaration) {
if (apic->uid == acpi_id)
goto found;
if (device_declaration && (apic->uid == acpi_id)) {
*apic_id = apic->local_apic_id;
return 1;
}
return 0;
found:
*apic_id = tmp;
return 1;
}
static int map_lsapic_id(struct acpi_subtable_header *entry,