Revert "dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled."

Revert double commit by mistake. Noticed by Thomas Gleixner.

This reverts commit cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca.

Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index e6caf5d..61b6c5b 100644 (file)
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -380,9 +380,6 @@ static int __init bay_init(void)
        if (acpi_disabled)
                return -ENODEV;
 
-       if (acpi_disabled)
-               return -ENODEV;
-
        /* look for dockable drive bays */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                ACPI_UINT32_MAX, find_bay, &bays, NULL);

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 1e872e7..bb7c51f 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -920,9 +920,6 @@ static int __init dock_init(void)
        if (acpi_disabled)
                return 0;
 
-       if (acpi_disabled)
-               return 0;
-
        /* look for a dock station */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                            ACPI_UINT32_MAX, find_dock, &num, NULL);