Merge branch 'acpi-modules'

* acpi-modules:
  platform: introduce OF style 'modalias' support for platform bus
  ACPI: fix module autoloading for ACPI enumerated devices
  ACPI: add module autoloading support for ACPI enumerated devices
  ACPI: fix create_modalias() return value handling

1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 3a94b799f166..bc78848dd59a 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -677,7 +677,17 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
                              char *buf)
 {
         struct platform_device  *pdev = to_platform_device(dev);
-        int len = snprintf(buf, PAGE_SIZE, "platform:%s\n", pdev->name);
+        int len;
+
+        len = of_device_get_modalias(dev, buf, PAGE_SIZE -1);
+        if (len != -ENODEV)
+                return len;
+
+        len = acpi_device_modalias(dev, buf, PAGE_SIZE -1);
+        if (len != -ENODEV)
+                return len;
+
+        len = snprintf(buf, PAGE_SIZE, "platform:%s\n", pdev->name);
 
         return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
 }
@@ -699,6 +709,10 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
         if (rc != -ENODEV)
                 return rc;
 
+        rc = acpi_device_uevent_modalias(dev, env);
+        if (rc != -ENODEV)
+                return rc;
+
         add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
                         pdev->name);
         return 0;