From patchwork Mon Feb 22 19:12:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 81269 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1MJDYaQ031179 for ; Mon, 22 Feb 2010 19:13:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754562Ab0BVTMH (ORCPT ); Mon, 22 Feb 2010 14:12:07 -0500 Received: from g4t0016.houston.hp.com ([15.201.24.19]:6823 "EHLO g4t0016.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754549Ab0BVTMG (ORCPT ); Mon, 22 Feb 2010 14:12:06 -0500 Received: from g4t0009.houston.hp.com (g4t0009.houston.hp.com [16.234.32.26]) by g4t0016.houston.hp.com (Postfix) with ESMTP id C95A014249; Mon, 22 Feb 2010 19:12:05 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g4t0009.houston.hp.com (Postfix) with ESMTP id A8613C0B2; Mon, 22 Feb 2010 19:12:05 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 94416CF0047; Mon, 22 Feb 2010 12:12:05 -0700 (MST) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eyPzWoMQa0ds; Mon, 22 Feb 2010 12:12:05 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 75D84CF0040; Mon, 22 Feb 2010 12:12:05 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 68D27261D1; Mon, 22 Feb 2010 12:12:05 -0700 (MST) Subject: [PATCH v2 12/12] ACPI: processor core: style and sparse cleanups To: lenb@kernel.org From: Alex Chiang Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Venkatesh Pallipadi Date: Mon, 22 Feb 2010 12:12:05 -0700 Message-ID: <20100222191205.19752.68325.stgit@bob.kio> In-Reply-To: <20100222190145.19752.20978.stgit@bob.kio> References: <20100222190145.19752.20978.stgit@bob.kio> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 22 Feb 2010 19:13:36 +0000 (UTC) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 791ac7b..1b0ca97 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);