Merge branch 'acpi-scan' into acpi-cleanup

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / glue.c

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 01551840d2365389ae8e0ea3c67054bc8655452f..9aee4fc2b218116c97de440fba0f061296cde5ab 100644 (file)
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -18,9 +18,14 @@
 
 #define ACPI_GLUE_DEBUG        0
 #if ACPI_GLUE_DEBUG
-#define DBG(x...) printk(PREFIX x)
+#define DBG(fmt, ...)                                          \
+       printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__)
 #else
-#define DBG(x...) do { } while(0)
+#define DBG(fmt, ...)                                          \
+do {                                                           \
+       if (0)                                                  \
+               printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__);   \
+} while (0)
 #endif
 static LIST_HEAD(bus_type_list);
 static DECLARE_RWSEM(bus_type_sem);
@@ -63,6 +68,9 @@ static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type)
 {
        struct acpi_bus_type *tmp, *ret = NULL;
 
+       if (!type)
+               return NULL;
+
        down_read(&bus_type_sem);
        list_for_each_entry(tmp, &bus_type_list, list) {
                if (tmp->bus == type) {
@@ -264,35 +272,46 @@ static int acpi_platform_notify(struct device *dev)
 {
        struct acpi_bus_type *type;
        acpi_handle handle;
-       int ret = -EINVAL;
+       int ret;
 
        ret = acpi_bind_one(dev, NULL);
-       if (!ret)
-               goto out;
-
-       if (!dev->bus || !dev->parent) {
+       if (ret && (!dev->bus || !dev->parent)) {
                /* bridge devices genernally haven't bus or parent */
                ret = acpi_find_bridge_device(dev, &handle);
-               goto end;
+               if (!ret) {
+                       ret = acpi_bind_one(dev, handle);
+                       if (ret)
+                               goto out;
+               }
        }
+
        type = acpi_get_bus_type(dev->bus);
-       if (!type) {
-               DBG("No ACPI bus support for %s\n", dev_name(dev));
-               ret = -EINVAL;
-               goto end;
+       if (ret) {
+               if (!type || !type->find_device) {
+                       DBG("No ACPI bus support for %s\n", dev_name(dev));
+                       ret = -EINVAL;
+                       goto out;
+               }
+
+               ret = type->find_device(dev, &handle);
+               if (ret) {
+                       DBG("Unable to get handle for %s\n", dev_name(dev));
+                       goto out;
+               }
+               ret = acpi_bind_one(dev, handle);
+               if (ret)
+                       goto out;
        }
-       if ((ret = type->find_device(dev, &handle)) != 0)
-               DBG("Can't get handler for %s\n", dev_name(dev));
- end:
-       if (!ret)
-               acpi_bind_one(dev, handle);
+
+       if (type && type->setup)
+               type->setup(dev);
 
  out:
 #if ACPI_GLUE_DEBUG
        if (!ret) {
                struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
-               acpi_get_name(dev->acpi_handle, ACPI_FULL_PATHNAME, &buffer);
+               acpi_get_name(ACPI_HANDLE(dev), ACPI_FULL_PATHNAME, &buffer);
                DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
                kfree(buffer.pointer);
        } else
@@ -304,6 +323,12 @@ static int acpi_platform_notify(struct device *dev)
 
 static int acpi_platform_notify_remove(struct device *dev)
 {
+       struct acpi_bus_type *type;
+
+       type = acpi_get_bus_type(dev->bus);
+       if (type && type->cleanup)
+               type->cleanup(dev);
+
        acpi_unbind_one(dev);
        return 0;
 }