From patchwork Mon Jan 25 21:41:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 75108 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 o0PLhEvL015226 for ; Mon, 25 Jan 2010 21:43:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753860Ab0AYVm3 (ORCPT ); Mon, 25 Jan 2010 16:42:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753710Ab0AYVld (ORCPT ); Mon, 25 Jan 2010 16:41:33 -0500 Received: from g4t0014.houston.hp.com ([15.201.24.17]:17117 "EHLO g4t0014.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680Ab0AYVlb (ORCPT ); Mon, 25 Jan 2010 16:41:31 -0500 Received: from g4t0009.houston.hp.com (g4t0009.houston.hp.com [16.234.32.26]) by g4t0014.houston.hp.com (Postfix) with ESMTP id BF9FC2462A; Mon, 25 Jan 2010 21:41:29 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g4t0009.houston.hp.com (Postfix) with ESMTP id AF351C073; Mon, 25 Jan 2010 21:41:29 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 95AE7CF0010; Mon, 25 Jan 2010 14:41:29 -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 pdT8hAVMVgqd; Mon, 25 Jan 2010 14:41:29 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 81CEFCF0016; Mon, 25 Jan 2010 14:41:29 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 64FF7262B3; Mon, 25 Jan 2010 14:41:29 -0700 (MST) Subject: [PATCH 10/12] ACPI: processor: refactor internal map_lsapic_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:29 -0700 Message-ID: <20100125214129.28510.72412.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 9213f95..ec5989c 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -83,27 +83,17 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, { struct acpi_madt_local_sapic *lsapic = (struct acpi_madt_local_sapic *)entry; - u32 tmp = (lsapic->id << 8) | lsapic->eid; - /* Only check enabled APICs*/ if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED)) return 0; - /* Device statement declaration type */ if (device_declaration) { - if (entry->length < 16) - printk(KERN_ERR PREFIX - "Invalid LSAPIC with Device type processor (SAPIC ID %#x)\n", - tmp); - else if (lsapic->uid == acpi_id) - goto found; - /* Processor statement declaration type */ - } else if (lsapic->processor_id == acpi_id) - goto found; + if ((entry->length < 16) || (lsapic->uid != acpi_id)) + return 0; + } else if (lsapic->processor_id != acpi_id) + return 0; - return 0; -found: - *apic_id = tmp; + *apic_id = (lsapic->id << 8) | lsapic->eid; return 1; }