ACPI: clean up scan.c

Adjust the code and make code doing similar things together.
No logic changes.

Signed-off-by : Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 316 insertions, 329 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 698a1540e303..e0255cbd5e19 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -111,233 +111,6 @@ static struct kset acpi_namespace_kset = {
         .uevent_ops = &namespace_uevent_ops,
 };
 
-static void acpi_device_register(struct acpi_device *device,
-                                 struct acpi_device *parent)
-{
-        int err;
-
-        /*
-         * Linkage
-         * -------
-         * Link this device to its parent and siblings.
-         */
-        INIT_LIST_HEAD(&device->children);
-        INIT_LIST_HEAD(&device->node);
-        INIT_LIST_HEAD(&device->g_list);
-        INIT_LIST_HEAD(&device->wakeup_list);
-
-        spin_lock(&acpi_device_lock);
-        if (device->parent) {
-                list_add_tail(&device->node, &device->parent->children);
-                list_add_tail(&device->g_list, &device->parent->g_list);
-        } else
-                list_add_tail(&device->g_list, &acpi_device_list);
-        if (device->wakeup.flags.valid)
-                list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);
-        spin_unlock(&acpi_device_lock);
-
-        strlcpy(device->kobj.name, device->pnp.bus_id, KOBJ_NAME_LEN);
-        if (parent)
-                device->kobj.parent = &parent->kobj;
-        device->kobj.ktype = &ktype_acpi_ns;
-        device->kobj.kset = &acpi_namespace_kset;
-        err = kobject_register(&device->kobj);
-        if (err < 0)
-                printk(KERN_WARNING "%s: kobject_register error: %d\n",
-                        __FUNCTION__, err);
-        create_sysfs_device_files(device);
-}
-
-static void acpi_device_unregister(struct acpi_device *device, int type)
-{
-        spin_lock(&acpi_device_lock);
-        if (device->parent) {
-                list_del(&device->node);
-                list_del(&device->g_list);
-        } else
-                list_del(&device->g_list);
-
-        list_del(&device->wakeup_list);
-
-        spin_unlock(&acpi_device_lock);
-
-        acpi_detach_data(device->handle, acpi_bus_data_handler);
-        remove_sysfs_device_files(device);
-        kobject_unregister(&device->kobj);
-}
-
-void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context)
-{
-
-        /* TBD */
-
-        return;
-}
-
-static int acpi_bus_get_power_flags(struct acpi_device *device)
-{
-        acpi_status status = 0;
-        acpi_handle handle = NULL;
-        u32 i = 0;
-
-
-        /*
-         * Power Management Flags
-         */
-        status = acpi_get_handle(device->handle, "_PSC", &handle);
-        if (ACPI_SUCCESS(status))
-                device->power.flags.explicit_get = 1;
-        status = acpi_get_handle(device->handle, "_IRC", &handle);
-        if (ACPI_SUCCESS(status))
-                device->power.flags.inrush_current = 1;
-
-        /*
-         * Enumerate supported power management states
-         */
-        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3; i++) {
-                struct acpi_device_power_state *ps = &device->power.states[i];
-                char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' };
-
-                /* Evaluate "_PRx" to se if power resources are referenced */
-                acpi_evaluate_reference(device->handle, object_name, NULL,
-                                        &ps->resources);
-                if (ps->resources.count) {
-                        device->power.flags.power_resources = 1;
-                        ps->flags.valid = 1;
-                }
-
-                /* Evaluate "_PSx" to see if we can do explicit sets */
-                object_name[2] = 'S';
-                status = acpi_get_handle(device->handle, object_name, &handle);
-                if (ACPI_SUCCESS(status)) {
-                        ps->flags.explicit_set = 1;
-                        ps->flags.valid = 1;
-                }
-
-                /* State is valid if we have some power control */
-                if (ps->resources.count || ps->flags.explicit_set)
-                        ps->flags.valid = 1;
-
-                ps->power = -1; /* Unknown - driver assigned */
-                ps->latency = -1;       /* Unknown - driver assigned */
-        }
-
-        /* Set defaults for D0 and D3 states (always valid) */
-        device->power.states[ACPI_STATE_D0].flags.valid = 1;
-        device->power.states[ACPI_STATE_D0].power = 100;
-        device->power.states[ACPI_STATE_D3].flags.valid = 1;
-        device->power.states[ACPI_STATE_D3].power = 0;
-
-        /* TBD: System wake support and resource requirements. */
-
-        device->power.state = ACPI_STATE_UNKNOWN;
-
-        return 0;
-}
-
-int acpi_match_ids(struct acpi_device *device, char *ids)
-{
-        if (device->flags.hardware_id)
-                if (strstr(ids, device->pnp.hardware_id))
-                        return 0;
-
-        if (device->flags.compatible_ids) {
-                struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
-                int i;
-
-                /* compare multiple _CID entries against driver ids */
-                for (i = 0; i < cid_list->count; i++) {
-                        if (strstr(ids, cid_list->id[i].value))
-                                return 0;
-                }
-        }
-        return -ENOENT;
-}
-
-static acpi_status
-acpi_bus_extract_wakeup_device_power_package(struct acpi_device *device,
-                                             union acpi_object *package)
-{
-        int i = 0;
-        union acpi_object *element = NULL;
-
-        if (!device || !package || (package->package.count < 2))
-                return AE_BAD_PARAMETER;
-
-        element = &(package->package.elements[0]);
-        if (!element)
-                return AE_BAD_PARAMETER;
-        if (element->type == ACPI_TYPE_PACKAGE) {
-                if ((element->package.count < 2) ||
-                    (element->package.elements[0].type !=
-                     ACPI_TYPE_LOCAL_REFERENCE)
-                    || (element->package.elements[1].type != ACPI_TYPE_INTEGER))
-                        return AE_BAD_DATA;
-                device->wakeup.gpe_device =
-                    element->package.elements[0].reference.handle;
-                device->wakeup.gpe_number =
-                    (u32) element->package.elements[1].integer.value;
-        } else if (element->type == ACPI_TYPE_INTEGER) {
-                device->wakeup.gpe_number = element->integer.value;
-        } else
-                return AE_BAD_DATA;
-
-        element = &(package->package.elements[1]);
-        if (element->type != ACPI_TYPE_INTEGER) {
-                return AE_BAD_DATA;
-        }
-        device->wakeup.sleep_state = element->integer.value;
-
-        if ((package->package.count - 2) > ACPI_MAX_HANDLES) {
-                return AE_NO_MEMORY;
-        }
-        device->wakeup.resources.count = package->package.count - 2;
-        for (i = 0; i < device->wakeup.resources.count; i++) {
-                element = &(package->package.elements[i + 2]);
-                if (element->type != ACPI_TYPE_ANY) {
-                        return AE_BAD_DATA;
-                }
-
-                device->wakeup.resources.handles[i] = element->reference.handle;
-        }
-
-        return AE_OK;
-}
-
-static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
-{
-        acpi_status status = 0;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object *package = NULL;
-
-
-        /* _PRW */
-        status = acpi_evaluate_object(device->handle, "_PRW", NULL, &buffer);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRW"));
-                goto end;
-        }
-
-        package = (union acpi_object *)buffer.pointer;
-        status = acpi_bus_extract_wakeup_device_power_package(device, package);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Extracting _PRW package"));
-                goto end;
-        }
-
-        kfree(buffer.pointer);
-
-        device->wakeup.flags.valid = 1;
-        /* Power button, Lid switch always enable wakeup */
-        if (!acpi_match_ids(device, "PNP0C0D,PNP0C0C,PNP0C0E"))
-                device->wakeup.flags.run_wake = 1;
-
-      end:
-        if (ACPI_FAILURE(status))
-                device->flags.wake_capable = 0;
-        return 0;
-}
-
 /* --------------------------------------------------------------------------
                 ACPI sysfs device file support
    -------------------------------------------------------------------------- */
@@ -447,20 +220,86 @@ acpi_eject_store(struct acpi_device *device, const char *buf, size_t count)
 }
 
 /* --------------------------------------------------------------------------
-                              Performance Management
+                        ACPI Bus operations
    -------------------------------------------------------------------------- */
+static inline struct acpi_device * to_acpi_dev(struct device * dev)
+{
+        return container_of(dev, struct acpi_device, dev);
+}
 
-static int acpi_bus_get_perf_flags(struct acpi_device *device)
+static int root_suspend(struct acpi_device * acpi_dev, pm_message_t state)
 {
-        device->performance.state = ACPI_STATE_UNKNOWN;
+        struct acpi_device * dev, * next;
+        int result;
+
+        spin_lock(&acpi_device_lock);
+        list_for_each_entry_safe_reverse(dev, next, &acpi_device_list, g_list) {
+                if (dev->driver && dev->driver->ops.suspend) {
+                        spin_unlock(&acpi_device_lock);
+                        result = dev->driver->ops.suspend(dev, 0);
+                        if (result) {
+                                printk(KERN_ERR PREFIX "[%s - %s] Suspend failed: %d\n",
+                                       acpi_device_name(dev),
+                                       acpi_device_bid(dev), result);
+                        }
+                        spin_lock(&acpi_device_lock);
+                }
+        }
+        spin_unlock(&acpi_device_lock);
         return 0;
 }
 
-/* --------------------------------------------------------------------------
-                                 Driver Management
-   -------------------------------------------------------------------------- */
+static int acpi_device_suspend(struct device * dev, pm_message_t state)
+{
+        struct acpi_device * acpi_dev = to_acpi_dev(dev);
 
-static LIST_HEAD(acpi_bus_drivers);
+        /*
+         * For now, we should only register 1 generic device -
+         * the ACPI root device - and from there, we walk the
+         * tree of ACPI devices to suspend each one using the
+         * ACPI driver methods.
+         */
+        if (acpi_dev->handle == ACPI_ROOT_OBJECT)
+                root_suspend(acpi_dev, state);
+        return 0;
+}
+
+static int root_resume(struct acpi_device * acpi_dev)
+{
+        struct acpi_device * dev, * next;
+        int result;
+
+        spin_lock(&acpi_device_lock);
+        list_for_each_entry_safe(dev, next, &acpi_device_list, g_list) {
+                if (dev->driver && dev->driver->ops.resume) {
+                        spin_unlock(&acpi_device_lock);
+                        result = dev->driver->ops.resume(dev, 0);
+                        if (result) {
+                                printk(KERN_ERR PREFIX "[%s - %s] resume failed: %d\n",
+                                       acpi_device_name(dev),
+                                       acpi_device_bid(dev), result);
+                        }
+                        spin_lock(&acpi_device_lock);
+                }
+        }
+        spin_unlock(&acpi_device_lock);
+        return 0;
+}
+
+static int acpi_device_resume(struct device * dev)
+{
+        struct acpi_device * acpi_dev = to_acpi_dev(dev);
+
+        /*
+         * For now, we should only register 1 generic device -
+         * the ACPI root device - and from there, we walk the
+         * tree of ACPI devices to resume each one using the
+         * ACPI driver methods.
+         */
+        if (acpi_dev->handle == ACPI_ROOT_OBJECT)
+                root_resume(acpi_dev);
+        return 0;
+}
 
 /**
  * acpi_bus_match - match device IDs to driver's supported IDs
@@ -478,6 +317,72 @@ acpi_bus_match(struct acpi_device *device, struct acpi_driver *driver)
         return acpi_match_ids(device, driver->ids);
 }
 
+static struct bus_type acpi_bus_type = {
+        .name           = "acpi",
+        .suspend        = acpi_device_suspend,
+        .resume         = acpi_device_resume,
+};
+
+static void acpi_device_register(struct acpi_device *device,
+                                 struct acpi_device *parent)
+{
+        int err;
+
+        /*
+         * Linkage
+         * -------
+         * Link this device to its parent and siblings.
+         */
+        INIT_LIST_HEAD(&device->children);
+        INIT_LIST_HEAD(&device->node);
+        INIT_LIST_HEAD(&device->g_list);
+        INIT_LIST_HEAD(&device->wakeup_list);
+
+        spin_lock(&acpi_device_lock);
+        if (device->parent) {
+                list_add_tail(&device->node, &device->parent->children);
+                list_add_tail(&device->g_list, &device->parent->g_list);
+        } else
+                list_add_tail(&device->g_list, &acpi_device_list);
+        if (device->wakeup.flags.valid)
+                list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);
+        spin_unlock(&acpi_device_lock);
+
+        strlcpy(device->kobj.name, device->pnp.bus_id, KOBJ_NAME_LEN);
+        if (parent)
+                device->kobj.parent = &parent->kobj;
+        device->kobj.ktype = &ktype_acpi_ns;
+        device->kobj.kset = &acpi_namespace_kset;
+        err = kobject_register(&device->kobj);
+        if (err < 0)
+                printk(KERN_WARNING "%s: kobject_register error: %d\n",
+                        __FUNCTION__, err);
+        create_sysfs_device_files(device);
+}
+
+static void acpi_device_unregister(struct acpi_device *device, int type)
+{
+        spin_lock(&acpi_device_lock);
+        if (device->parent) {
+                list_del(&device->node);
+                list_del(&device->g_list);
+        } else
+                list_del(&device->g_list);
+
+        list_del(&device->wakeup_list);
+
+        spin_unlock(&acpi_device_lock);
+
+        acpi_detach_data(device->handle, acpi_bus_data_handler);
+        remove_sysfs_device_files(device);
+        kobject_unregister(&device->kobj);
+}
+
+/* --------------------------------------------------------------------------
+                                 Driver Management
+   -------------------------------------------------------------------------- */
+static LIST_HEAD(acpi_bus_drivers);
+
 /**
  * acpi_bus_driver_init - add a device to a driver
  * @device: the device to add and initialize
@@ -668,7 +573,6 @@ static int acpi_bus_find_driver(struct acpi_device *device)
 /* --------------------------------------------------------------------------
                                  Device Enumeration
    -------------------------------------------------------------------------- */
-
 acpi_status
 acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
 {
@@ -691,6 +595,183 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
 }
 EXPORT_SYMBOL_GPL(acpi_bus_get_ejd);
 
+void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context)
+{
+
+        /* TBD */
+
+        return;
+}
+
+int acpi_match_ids(struct acpi_device *device, char *ids)
+{
+        if (device->flags.hardware_id)
+                if (strstr(ids, device->pnp.hardware_id))
+                        return 0;
+
+        if (device->flags.compatible_ids) {
+                struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
+                int i;
+
+                /* compare multiple _CID entries against driver ids */
+                for (i = 0; i < cid_list->count; i++) {
+                        if (strstr(ids, cid_list->id[i].value))
+                                return 0;
+                }
+        }
+        return -ENOENT;
+}
+
+static int acpi_bus_get_perf_flags(struct acpi_device *device)
+{
+        device->performance.state = ACPI_STATE_UNKNOWN;
+        return 0;
+}
+
+static acpi_status
+acpi_bus_extract_wakeup_device_power_package(struct acpi_device *device,
+                                             union acpi_object *package)
+{
+        int i = 0;
+        union acpi_object *element = NULL;
+
+        if (!device || !package || (package->package.count < 2))
+                return AE_BAD_PARAMETER;
+
+        element = &(package->package.elements[0]);
+        if (!element)
+                return AE_BAD_PARAMETER;
+        if (element->type == ACPI_TYPE_PACKAGE) {
+                if ((element->package.count < 2) ||
+                    (element->package.elements[0].type !=
+                     ACPI_TYPE_LOCAL_REFERENCE)
+                    || (element->package.elements[1].type != ACPI_TYPE_INTEGER))
+                        return AE_BAD_DATA;
+                device->wakeup.gpe_device =
+                    element->package.elements[0].reference.handle;
+                device->wakeup.gpe_number =
+                    (u32) element->package.elements[1].integer.value;
+        } else if (element->type == ACPI_TYPE_INTEGER) {
+                device->wakeup.gpe_number = element->integer.value;
+        } else
+                return AE_BAD_DATA;
+
+        element = &(package->package.elements[1]);
+        if (element->type != ACPI_TYPE_INTEGER) {
+                return AE_BAD_DATA;
+        }
+        device->wakeup.sleep_state = element->integer.value;
+
+        if ((package->package.count - 2) > ACPI_MAX_HANDLES) {
+                return AE_NO_MEMORY;
+        }
+        device->wakeup.resources.count = package->package.count - 2;
+        for (i = 0; i < device->wakeup.resources.count; i++) {
+                element = &(package->package.elements[i + 2]);
+                if (element->type != ACPI_TYPE_ANY) {
+                        return AE_BAD_DATA;
+                }
+
+                device->wakeup.resources.handles[i] = element->reference.handle;
+        }
+
+        return AE_OK;
+}
+
+static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
+{
+        acpi_status status = 0;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *package = NULL;
+
+
+        /* _PRW */
+        status = acpi_evaluate_object(device->handle, "_PRW", NULL, &buffer);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRW"));
+                goto end;
+        }
+
+        package = (union acpi_object *)buffer.pointer;
+        status = acpi_bus_extract_wakeup_device_power_package(device, package);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "Extracting _PRW package"));
+                goto end;
+        }
+
+        kfree(buffer.pointer);
+
+        device->wakeup.flags.valid = 1;
+        /* Power button, Lid switch always enable wakeup */
+        if (!acpi_match_ids(device, "PNP0C0D,PNP0C0C,PNP0C0E"))
+                device->wakeup.flags.run_wake = 1;
+
+      end:
+        if (ACPI_FAILURE(status))
+                device->flags.wake_capable = 0;
+        return 0;
+}
+
+static int acpi_bus_get_power_flags(struct acpi_device *device)
+{
+        acpi_status status = 0;
+        acpi_handle handle = NULL;
+        u32 i = 0;
+
+
+        /*
+         * Power Management Flags
+         */
+        status = acpi_get_handle(device->handle, "_PSC", &handle);
+        if (ACPI_SUCCESS(status))
+                device->power.flags.explicit_get = 1;
+        status = acpi_get_handle(device->handle, "_IRC", &handle);
+        if (ACPI_SUCCESS(status))
+                device->power.flags.inrush_current = 1;
+
+        /*
+         * Enumerate supported power management states
+         */
+        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3; i++) {
+                struct acpi_device_power_state *ps = &device->power.states[i];
+                char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' };
+
+                /* Evaluate "_PRx" to se if power resources are referenced */
+                acpi_evaluate_reference(device->handle, object_name, NULL,
+                                        &ps->resources);
+                if (ps->resources.count) {
+                        device->power.flags.power_resources = 1;
+                        ps->flags.valid = 1;
+                }
+
+                /* Evaluate "_PSx" to see if we can do explicit sets */
+                object_name[2] = 'S';
+                status = acpi_get_handle(device->handle, object_name, &handle);
+                if (ACPI_SUCCESS(status)) {
+                        ps->flags.explicit_set = 1;
+                        ps->flags.valid = 1;
+                }
+
+                /* State is valid if we have some power control */
+                if (ps->resources.count || ps->flags.explicit_set)
+                        ps->flags.valid = 1;
+
+                ps->power = -1; /* Unknown - driver assigned */
+                ps->latency = -1;       /* Unknown - driver assigned */
+        }
+
+        /* Set defaults for D0 and D3 states (always valid) */
+        device->power.states[ACPI_STATE_D0].flags.valid = 1;
+        device->power.states[ACPI_STATE_D0].power = 100;
+        device->power.states[ACPI_STATE_D3].flags.valid = 1;
+        device->power.states[ACPI_STATE_D3].power = 0;
+
+        /* TBD: System wake support and resource requirements. */
+
+        device->power.state = ACPI_STATE_UNKNOWN;
+
+        return 0;
+}
 
 static int acpi_bus_get_flags(struct acpi_device *device)
 {
@@ -1353,100 +1434,6 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
         return result;
 }
 
-
-static inline struct acpi_device * to_acpi_dev(struct device * dev)
-{
-        return container_of(dev, struct acpi_device, dev);
-}
-
-
-static int root_suspend(struct acpi_device * acpi_dev, pm_message_t state)
-{
-        struct acpi_device * dev, * next;
-        int result;
-
-        spin_lock(&acpi_device_lock);
-        list_for_each_entry_safe_reverse(dev, next, &acpi_device_list, g_list) {
-                if (dev->driver && dev->driver->ops.suspend) {
-                        spin_unlock(&acpi_device_lock);
-                        result = dev->driver->ops.suspend(dev, 0);
-                        if (result) {
-                                printk(KERN_ERR PREFIX "[%s - %s] Suspend failed: %d\n",
-                                       acpi_device_name(dev),
-                                       acpi_device_bid(dev), result);
-                        }
-                        spin_lock(&acpi_device_lock);
-                }
-        }
-        spin_unlock(&acpi_device_lock);
-        return 0;
-}
-
-
-static int acpi_device_suspend(struct device * dev, pm_message_t state)
-{
-        struct acpi_device * acpi_dev = to_acpi_dev(dev);
-
-        /*
-         * For now, we should only register 1 generic device -
-         * the ACPI root device - and from there, we walk the
-         * tree of ACPI devices to suspend each one using the
-         * ACPI driver methods.
-         */
-        if (acpi_dev->handle == ACPI_ROOT_OBJECT)
-                root_suspend(acpi_dev, state);
-        return 0;
-}
-
-
-
-static int root_resume(struct acpi_device * acpi_dev)
-{
-        struct acpi_device * dev, * next;
-        int result;
-
-        spin_lock(&acpi_device_lock);
-        list_for_each_entry_safe(dev, next, &acpi_device_list, g_list) {
-                if (dev->driver && dev->driver->ops.resume) {
-                        spin_unlock(&acpi_device_lock);
-                        result = dev->driver->ops.resume(dev, 0);
-                        if (result) {
-                                printk(KERN_ERR PREFIX "[%s - %s] resume failed: %d\n",
-                                       acpi_device_name(dev),
-                                       acpi_device_bid(dev), result);
-                        }
-                        spin_lock(&acpi_device_lock);
-                }
-        }
-        spin_unlock(&acpi_device_lock);
-        return 0;
-}
-
-
-static int acpi_device_resume(struct device * dev)
-{
-        struct acpi_device * acpi_dev = to_acpi_dev(dev);
-
-        /*
-         * For now, we should only register 1 generic device -
-         * the ACPI root device - and from there, we walk the
-         * tree of ACPI devices to resume each one using the
-         * ACPI driver methods.
-         */
-        if (acpi_dev->handle == ACPI_ROOT_OBJECT)
-                root_resume(acpi_dev);
-        return 0;
-}
-
-
-static struct bus_type acpi_bus_type = {
-        .name           = "acpi",
-        .suspend        = acpi_device_suspend,
-        .resume         = acpi_device_resume,
-};
-
-
-
 static int __init acpi_scan_init(void)
 {
         int result;