of: Always use 'struct device.of_node' to get device node pointer.

[safe/jmp/linux-2.6] / sound / aoa / soundbus / sysfs.c

diff --git a/sound/aoa/soundbus/sysfs.c b/sound/aoa/soundbus/sysfs.c
index f580942..6496e75 100644 (file)
--- a/sound/aoa/soundbus/sysfs.c
+++ b/sound/aoa/soundbus/sysfs.c
@@ -9,7 +9,7 @@ field##_show (struct device *dev, struct device_attribute *attr,        \
               char *buf)                                               \
 {                                                                      \
        struct soundbus_dev *mdev = to_soundbus_device (dev);           \
-       return sprintf (buf, format_string, mdev->ofdev.node->field);   \
+       return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
@@ -25,7 +25,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                length = strlen(buf);
        } else {
                length = sprintf(buf, "of:N%sT%s\n",
-                                of->node->name, of->node->type);
+                                of->dev.of_node->name, of->dev.of_node->type);
        }
 
        return length;