From patchwork Mon Jan 25 21:41:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 75105 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0PLhEvH015226 for ; Mon, 25 Jan 2010 21:43:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753719Ab0AYVlf (ORCPT ); Mon, 25 Jan 2010 16:41:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751399Ab0AYVle (ORCPT ); Mon, 25 Jan 2010 16:41:34 -0500 Received: from g4t0016.houston.hp.com ([15.201.24.19]:47569 "EHLO g4t0016.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753662Ab0AYVla (ORCPT ); Mon, 25 Jan 2010 16:41:30 -0500 Received: from g4t0018.houston.hp.com (g4t0018.houston.hp.com [16.234.32.27]) by g4t0016.houston.hp.com (Postfix) with ESMTP id 9832414116; Mon, 25 Jan 2010 21:41:24 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g4t0018.houston.hp.com (Postfix) with ESMTP id 871BA10026; Mon, 25 Jan 2010 21:41:24 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 6BA2ECF0014; Mon, 25 Jan 2010 14:41:24 -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 5oCobacIkjeI; Mon, 25 Jan 2010 14:41:24 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 58F40CF0010; Mon, 25 Jan 2010 14:41:24 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 4A149262B3; Mon, 25 Jan 2010 14:41:24 -0700 (MST) Subject: [PATCH 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 Date: Mon, 25 Jan 2010 14:41:24 -0700 Message-ID: <20100125214124.28510.81186.stgit@bob.kio> In-Reply-To: <20100125213221.28510.74078.stgit@bob.kio> References: <20100125213221.28510.74078.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 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,