summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-17 01:59:38 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-17 01:59:38 +0100
commitbc411b8a643825b634916f9ba167546a88a0ac28 (patch)
tree9243b5c8139391e003e31bea845a59975aeced3e /drivers/base
parent8341ecc9f4eb7513951bd1986d78185a11ac6d4e (diff)
parentb9f73067f32531db608e469a9ad20ce631e34550 (diff)
downloadop-kernel-dev-bc411b8a643825b634916f9ba167546a88a0ac28.zip
op-kernel-dev-bc411b8a643825b634916f9ba167546a88a0ac28.tar.gz
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
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 3a94b79..bc78848 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;
OpenPOWER on IntegriCloud