2 files changed, 23 insertions, 16 deletions

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 29681c4b700b..8fbfeee53c1e 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -48,16 +48,32 @@ void of_dev_put(struct of_device *dev)
 }
 EXPORT_SYMBOL(of_dev_put);
 
-static ssize_t dev_show_devspec(struct device *dev,
+static ssize_t devspec_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         struct of_device *ofdev;
 
         ofdev = to_of_device(dev);
-        return sprintf(buf, "%s", ofdev->node->full_name);
+        return sprintf(buf, "%s\n", ofdev->node->full_name);
 }
 
-static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);
+static ssize_t modalias_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct of_device *ofdev = to_of_device(dev);
+        ssize_t len = 0;
+
+        len = of_device_get_modalias(ofdev, buf, PAGE_SIZE - 2);
+        buf[len] = '\n';
+        buf[len+1] = 0;
+        return len+1;
+}
+
+struct device_attribute of_platform_device_attrs[] = {
+        __ATTR_RO(devspec),
+        __ATTR_RO(modalias),
+        __ATTR_NULL
+};
 
 /**
  * of_release_dev - free an of device structure when all users of it are finished.
@@ -78,25 +94,13 @@ EXPORT_SYMBOL(of_release_dev);
 
 int of_device_register(struct of_device *ofdev)
 {
-        int rc;
-
         BUG_ON(ofdev->node == NULL);
-
-        rc = device_register(&ofdev->dev);
-        if (rc)
-                return rc;
-
-        rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
-        if (rc)
-                device_unregister(&ofdev->dev);
-
-        return rc;
+        return device_register(&ofdev->dev);
 }
 EXPORT_SYMBOL(of_device_register);
 
 void of_device_unregister(struct of_device *ofdev)
 {
-        device_remove_file(&ofdev->dev, &dev_attr_devspec);
         device_unregister(&ofdev->dev);
 }
 EXPORT_SYMBOL(of_device_unregister);
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index ca09a63a64db..298de0f95d70 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -17,6 +17,8 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 
+extern struct device_attribute of_platform_device_attrs[];
+
 static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct of_device *of_dev = to_of_device(dev);
@@ -103,6 +105,7 @@ int of_bus_type_init(struct bus_type *bus, const char *name)
         bus->suspend = of_platform_device_suspend;
         bus->resume = of_platform_device_resume;
         bus->shutdown = of_platform_device_shutdown;
+        bus->dev_attrs = of_platform_device_attrs;
         return bus_register(bus);
 }