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

ACPI: processor: refactor internal map_lsapic_id()

Un-nest the if statements for readability.

Remove comments that re-state the obvious.

Change the control flow so that we no longer need a temp variable.
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 d6742095
...@@ -83,27 +83,17 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, ...@@ -83,27 +83,17 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
{ {
struct acpi_madt_local_sapic *lsapic = struct acpi_madt_local_sapic *lsapic =
(struct acpi_madt_local_sapic *)entry; (struct acpi_madt_local_sapic *)entry;
u32 tmp = (lsapic->id << 8) | lsapic->eid;
/* Only check enabled APICs*/
if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED)) if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))
return 0; return 0;
/* Device statement declaration type */
if (device_declaration) { if (device_declaration) {
if (entry->length < 16) if ((entry->length < 16) || (lsapic->uid != acpi_id))
printk(KERN_ERR PREFIX return 0;
"Invalid LSAPIC with Device type processor (SAPIC ID %#x)\n", } else if (lsapic->processor_id != acpi_id)
tmp); return 0;
else if (lsapic->uid == acpi_id)
goto found;
/* Processor statement declaration type */
} else if (lsapic->processor_id == acpi_id)
goto found;
return 0; *apic_id = (lsapic->id << 8) | lsapic->eid;
found:
*apic_id = tmp;
return 1; return 1;
} }
......
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