From patchwork Mon Sep 21 19:29:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 49100 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8LJTo3p009248 for ; Mon, 21 Sep 2009 19:29:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753152AbZIUT3n (ORCPT ); Mon, 21 Sep 2009 15:29:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753415AbZIUT3m (ORCPT ); Mon, 21 Sep 2009 15:29:42 -0400 Received: from g1t0026.austin.hp.com ([15.216.28.33]:32769 "EHLO g1t0026.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753152AbZIUT3m (ORCPT ); Mon, 21 Sep 2009 15:29:42 -0400 Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142]) by g1t0026.austin.hp.com (Postfix) with ESMTP id 500F0C15C; Mon, 21 Sep 2009 19:29:46 +0000 (UTC) Received: from ldl (linux.corp.hp.com [15.11.146.101]) by g5t0030.atlanta.hp.com (Postfix) with ESMTP id 28D77241A0; Mon, 21 Sep 2009 19:29:46 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 19839CF000F; Mon, 21 Sep 2009 13:29:46 -0600 (MDT) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dxGITeBn5MwK; Mon, 21 Sep 2009 13:29:46 -0600 (MDT) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 07B8FCF000D; Mon, 21 Sep 2009 13:29:46 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id CDA2F2615C; Mon, 21 Sep 2009 13:29:45 -0600 (MDT) Subject: [PATCH v3 12/17] ACPI: enumerate namespace before adding functional fixed hardware devices To: Len Brown From: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org Date: Mon, 21 Sep 2009 13:29:45 -0600 Message-ID: <20090921192945.21322.61922.stgit@bob.kio> In-Reply-To: <20090921192656.21322.23072.stgit@bob.kio> References: <20090921192656.21322.23072.stgit@bob.kio> User-Agent: StGit/0.14.3.386.gb02d MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org This patch changes the order so we enumerate in the "root, namespace, functional fixed" order instead of the "root, functional fixed, namespace" order. When I change acpi_bus_scan() to use acpi_walk_namespace(), it will use the former order, so this patch isolates the order change for bisectability. Signed-off-by: Bjorn Helgaas --- drivers/acpi/scan.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 4fe7359..27d2dec 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1650,10 +1650,10 @@ int __init acpi_scan_init(void) /* * Enumerate devices in the ACPI namespace. */ - result = acpi_bus_scan_fixed(); + result = acpi_bus_scan(acpi_root->handle, &ops); if (!result) - result = acpi_bus_scan(acpi_root->handle, &ops); + result = acpi_bus_scan_fixed(); if (result) acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);