[PATCH v3 12/17] ACPI: enumerate namespace before adding functional fixed hardware devices

Bjorn Helgaas
2009-09-21T19:29:42Z

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 <bjorn.helgaas@hp.com>
---
drivers/acpi/scan.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

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);