4 files changed, 8 insertions, 18 deletions

diff --git a/arch/microblaze/include/asm/of_device.h b/arch/microblaze/include/asm/of_device.h
index 58e627dc1412..c9be53487434 100644
--- a/arch/microblaze/include/asm/of_device.h
+++ b/arch/microblaze/include/asm/of_device.h
@@ -15,9 +15,6 @@
 #include <linux/device.h>
 #include <linux/of.h>
 
-extern ssize_t of_device_get_modalias(struct of_device *ofdev,
-                                        char *str, ssize_t len);
-
 extern struct of_device *of_device_alloc(struct device_node *np,
                                          const char *bus_id,
                                          struct device *parent);
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index 6999ce59fd10..6024038a5b9d 100644
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -41,10 +41,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
 static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
                               char *buf)
 {
-        struct of_device *ofdev = to_of_device(dev);
-        int len;
-
-        len = of_device_get_modalias(ofdev, buf, PAGE_SIZE - 2);
+        int len = of_device_get_modalias(dev, buf, PAGE_SIZE - 2);
 
         buf[len] = '\n';
         buf[len+1] = 0;
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 275cc9cee14c..c2a98f5ca80d 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -68,10 +68,7 @@ static ssize_t name_show(struct device *dev,
 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);
+        ssize_t len = of_device_get_modalias(dev, buf, PAGE_SIZE - 2);
         buf[len] = '\n';
         buf[len+1] = 0;
         return len+1;
@@ -123,19 +120,18 @@ void of_device_unregister(struct of_device *ofdev)
 }
 EXPORT_SYMBOL(of_device_unregister);
 
-ssize_t of_device_get_modalias(struct of_device *ofdev,
-                                char *str, ssize_t len)
+ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len)
 {
         const char *compat;
         int cplen, i;
         ssize_t tsize, csize, repend;
 
         /* Name & Type */
-        csize = snprintf(str, len, "of:N%sT%s", ofdev->dev.of_node->name,
-                         ofdev->dev.of_node->type);
+        csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
+                         dev->of_node->type);
 
         /* Get compatible property if any */
-        compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
+        compat = of_get_property(dev->of_node, "compatible", &cplen);
         if (!compat)
                 return csize;
 
@@ -210,7 +206,7 @@ int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
         if (add_uevent_var(env, "MODALIAS="))
                 return -ENOMEM;
 
-        sl = of_device_get_modalias(to_of_device(dev), &env->buf[env->buflen-1],
+        sl = of_device_get_modalias(dev, &env->buf[env->buflen-1],
                                     sizeof(env->buf) - env->buflen);
         if (sl >= (sizeof(env->buf) - env->buflen))
                 return -ENOMEM;
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index da83e734c026..238e92e007e6 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -42,7 +42,7 @@ static inline void of_device_free(struct of_device *dev)
         of_release_dev(&dev->dev);
 }
 
-extern ssize_t of_device_get_modalias(struct of_device *ofdev,
+extern ssize_t of_device_get_modalias(struct device *dev,
                                         char *str, ssize_t len);
 
 extern int of_device_uevent(struct device *dev, struct kobj_uevent_env *env);