[12/12] ACPI: processor core: style and sparse cleanups

Commit Message

Alexander Chiang Jan. 25, 2010, 9:41 p.m. UTC

None

Patch

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index ae69f6d..4c34ec0 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -46,9 +46,9 @@  static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
 static int map_lapic_id(struct acpi_subtable_header *entry,
 		 u32 acpi_id, int *apic_id)
 {
-	struct acpi_madt_local_apic *lapic =
-		(struct acpi_madt_local_apic *)entry;
+	struct acpi_madt_local_apic *lapic;
 
+	lapic = (struct acpi_madt_local_apic *)entry;
 	if (!(lapic->lapic_flags & ACPI_MADT_ENABLED))
 		return 0;
 
@@ -62,14 +62,14 @@  static int map_lapic_id(struct acpi_subtable_header *entry,
 static int map_x2apic_id(struct acpi_subtable_header *entry,
 			 int device_declaration, u32 acpi_id, int *apic_id)
 {
-	struct acpi_madt_local_x2apic *apic =
-		(struct acpi_madt_local_x2apic *)entry;
+	struct acpi_madt_local_x2apic *lx2apic;
 
-	if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
+	lx2apic = (struct acpi_madt_local_x2apic *)entry;
+	if (!(lx2apic->lapic_flags & ACPI_MADT_ENABLED))
 		return 0;
 
-	if (device_declaration && (apic->uid == acpi_id)) {
-		*apic_id = apic->local_apic_id;
+	if (device_declaration && (lx2apic->uid == acpi_id)) {
+		*apic_id = lx2apic->local_apic_id;
 		return 1;
 	}
 
@@ -79,9 +79,9 @@  static int map_x2apic_id(struct acpi_subtable_header *entry,
 static int map_lsapic_id(struct acpi_subtable_header *entry,
 		int device_declaration, u32 acpi_id, int *apic_id)
 {
-	struct acpi_madt_local_sapic *lsapic =
-		(struct acpi_madt_local_sapic *)entry;
+	struct acpi_madt_local_sapic *lsapic;
 
+	lsapic = (struct acpi_madt_local_sapic *)entry;
 	if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))
 		return 0;
 
@@ -98,6 +98,7 @@  static int map_lsapic_id(struct acpi_subtable_header *entry,
 static int map_madt_entry(int type, u32 acpi_id)
 {
 	unsigned long madt_end, entry;
+	struct acpi_subtable_header *header;
 	static struct acpi_table_madt *madt;
 	static int read_madt;
 	int apic_id = -1;
@@ -115,12 +116,10 @@  static int map_madt_entry(int type, u32 acpi_id)
 	entry = (unsigned long)madt;
 	madt_end = entry + madt->header.length;
 
-	/* Parse all entries looking for a match. */
-
 	entry += sizeof(struct acpi_table_madt);
 	while (entry + sizeof(struct acpi_subtable_header) < madt_end) {
-		struct acpi_subtable_header *header =
-			(struct acpi_subtable_header *)entry;
+		header = (struct acpi_subtable_header *)entry;
+
 		if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
 			if (map_lapic_id(header, acpi_id, &apic_id))
 				break;
@@ -151,20 +150,17 @@  static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
 
 	obj = buffer.pointer;
 	if (obj->type != ACPI_TYPE_BUFFER ||
-	    obj->buffer.length < sizeof(struct acpi_subtable_header)) {
+	    obj->buffer.length < sizeof(struct acpi_subtable_header))
 		goto exit;
-	}
 
 	header = (struct acpi_subtable_header *)obj->buffer.pointer;
-	if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
+	if (header->type == ACPI_MADT_TYPE_LOCAL_APIC)
 		map_lapic_id(header, acpi_id, &apic_id);
-	} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
+	else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC)
 		map_lsapic_id(header, type, acpi_id, &apic_id);
-	}
 
 exit:
-	if (buffer.pointer)
-		kfree(buffer.pointer);
+	kfree(buffer.pointer);
 	return apic_id;
 }
 
@@ -179,10 +175,9 @@  int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
 	if (apic_id == -1)
 		return apic_id;
 
-	for_each_possible_cpu(i) {
+	for_each_possible_cpu(i)
 		if (cpu_physical_id(i) == apic_id)
 			return i;
-	}
 	return -1;
 }
 EXPORT_SYMBOL_GPL(acpi_get_cpuid);