From patchwork Mon Feb 22 19:11:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 81271 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 o1MJDYaS031179 for ; Mon, 22 Feb 2010 19:13:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754160Ab0BVTNB (ORCPT ); Mon, 22 Feb 2010 14:13:01 -0500 Received: from g1t0027.austin.hp.com ([15.216.28.34]:10202 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754397Ab0BVTLv (ORCPT ); Mon, 22 Feb 2010 14:11:51 -0500 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0027.austin.hp.com (Postfix) with ESMTP id 5EC87381D2; Mon, 22 Feb 2010 19:11:50 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 4DFE6300DD; Mon, 22 Feb 2010 19:11:50 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 37602CF0047; Mon, 22 Feb 2010 12:11:50 -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 pb8AggtFiKgU; Mon, 22 Feb 2010 12:11:50 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 23D8CCF0040; Mon, 22 Feb 2010 12:11:50 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 098E6261D1; Mon, 22 Feb 2010 12:11:50 -0700 (MST) Subject: [PATCH v2 09/12] ACPI: processor: refactor internal map_x2apic_id() 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:11:50 -0700 Message-ID: <20100222191149.19752.78161.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 9eeda9e..18fa633 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,