diff options
| author |   Alex Chiang <achiang@hp.com> | 2010-02-22 12:11:50 -0700 |
|---|---|---|
| committer |   Len Brown <len.brown@intel.com> | 2010-03-14 21:17:24 -0400 |
| commit | d67420956b7b1dcffb894b2f1f81b9408fca1b4c (patch) | |
| tree | 6dc450d623398f9c27ab0c2590356f4bb8a2408f /drivers/acpi/processor_core.c | |
| parent | ACPI: processor: refactor internal map_lapic_id() (diff) | |
| download | linux-dev-d67420956b7b1dcffb894b2f1f81b9408fca1b4c.tar.xz linux-dev-d67420956b7b1dcffb894b2f1f81b9408fca1b4c.zip | |
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 <venkatesh.pallipadi@intel.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/acpi/processor_core.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 9eeda9e437ea..18fa6337c12c 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -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, |