From patchwork Mon Jan 25 21:41:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 75109 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 o0PLhEvM015226 for ; Mon, 25 Jan 2010 21:43:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753732Ab0AYVmd (ORCPT ); Mon, 25 Jan 2010 16:42:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753638Ab0AYVlX (ORCPT ); Mon, 25 Jan 2010 16:41:23 -0500 Received: from g4t0017.houston.hp.com ([15.201.24.20]:8953 "EHLO g4t0017.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753605Ab0AYVlU (ORCPT ); Mon, 25 Jan 2010 16:41:20 -0500 Received: from g4t0018.houston.hp.com (g4t0018.houston.hp.com [16.234.32.27]) by g4t0017.houston.hp.com (Postfix) with ESMTP id 92A4D3833A; Mon, 25 Jan 2010 21:41:19 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g4t0018.houston.hp.com (Postfix) with ESMTP id 6EA0F10056; Mon, 25 Jan 2010 21:41:19 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 51332CF0014; Mon, 25 Jan 2010 14:41:19 -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 H1SWqaJtp5mE; Mon, 25 Jan 2010 14:41:19 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 3D9D1CF0010; Mon, 25 Jan 2010 14:41:19 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 2D37E262B3; Mon, 25 Jan 2010 14:41:19 -0700 (MST) Subject: [PATCH 08/12] ACPI: processor: refactor internal map_lapic_id() To: lenb@kernel.org From: Alex Chiang Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Venkatesh Pallipadi Date: Mon, 25 Jan 2010 14:41:19 -0700 Message-ID: <20100125214119.28510.84191.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 1fc06c6..bebd411 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -50,12 +50,15 @@ static int map_lapic_id(struct acpi_subtable_header *entry, { struct acpi_madt_local_apic *lapic = (struct acpi_madt_local_apic *)entry; - if ((lapic->lapic_flags & ACPI_MADT_ENABLED) && - lapic->processor_id == acpi_id) { - *apic_id = lapic->id; - return 1; - } - return 0; + + if (!(lapic->lapic_flags & ACPI_MADT_ENABLED)) + return 0; + + if (lapic->processor_id != acpi_id) + return 0; + + *apic_id = lapic->id; + return 1; } static int map_x2apic_id(struct acpi_subtable_header *entry,