1 files changed, 57 insertions, 0 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c92532158195..680bb5647701 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -116,6 +116,63 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
         return len;
 }
 
+/*
+ * Creates uevent modalias field for ACPI enumerated devices.
+ * Because the other buses does not support ACPI HIDs & CIDs.
+ * e.g. for a device with hid:IBM0001 and cid:ACPI0001 you get:
+ * "acpi:IBM0001:ACPI0001"
+ */
+int acpi_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct acpi_device *acpi_dev;
+        int len;
+
+        acpi_dev = ACPI_COMPANION(dev);
+        if (!acpi_dev)
+                return -ENODEV;
+
+        /* Fall back to bus specific way of modalias exporting */
+        if (list_empty(&acpi_dev->pnp.ids))
+                return -ENODEV;
+
+        if (add_uevent_var(env, "MODALIAS="))
+                return -ENOMEM;
+        len = create_modalias(acpi_dev, &env->buf[env->buflen - 1],
+                                sizeof(env->buf) - env->buflen);
+        if (len <= 0)
+                return len;
+        env->buflen += len;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_device_uevent_modalias);
+
+/*
+ * Creates modalias sysfs attribute for ACPI enumerated devices.
+ * Because the other buses does not support ACPI HIDs & CIDs.
+ * e.g. for a device with hid:IBM0001 and cid:ACPI0001 you get:
+ * "acpi:IBM0001:ACPI0001"
+ */
+int acpi_device_modalias(struct device *dev, char *buf, int size)
+{
+        struct acpi_device *acpi_dev;
+        int len;
+
+        acpi_dev = ACPI_COMPANION(dev);
+        if (!acpi_dev)
+                return -ENODEV;
+
+        /* Fall back to bus specific way of modalias exporting */
+        if (list_empty(&acpi_dev->pnp.ids))
+                return -ENODEV;
+
+        len = create_modalias(acpi_dev, buf, size -1);
+        if (len <= 0)
+                return len;
+        buf[len++] = '\n';
+        return len;
+}
+EXPORT_SYMBOL_GPL(acpi_device_modalias);
+
 static ssize_t
 acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, char *buf) {
         struct acpi_device *acpi_dev = to_acpi_device(dev);