[PATCH 09/12] ACPI: processor: refactor internal map_x2apic_id()

Alex Chiang
2010-01-25T21:41:39Z

Untangle the nested if conditions to make this function look
more similar to the other map_*apic_id() functions.

Signed-off-by: Alex Chiang <achiang@hp.com>
---

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 bebd411..9213f95 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,