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

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

diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index fa8ab28..99ca712 100644 (file)
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -74,11 +74,11 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)
        of = &soundbus_dev->ofdev;
 
        /* stuff we want to pass to /sbin/hotplug */
-       retval = add_uevent_var(env, "OF_NAME=%s", of->node->name);
+       retval = add_uevent_var(env, "OF_NAME=%s", of->dev.of_node->name);
        if (retval)
                return retval;
 
-       retval = add_uevent_var(env, "OF_TYPE=%s", of->node->type);
+       retval = add_uevent_var(env, "OF_TYPE=%s", of->dev.of_node->type);
        if (retval)
                return retval;
 
@@ -86,7 +86,7 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)
         * it's not really legal to split it out with commas. We split it
         * up using a number of environment variables instead. */
 
-       compat = of_get_property(of->node, "compatible", &cplen);
+       compat = of_get_property(of->dev.of_node, "compatible", &cplen);
        while (compat && cplen > 0) {
                int tmp = env->buflen;
                retval = add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat);
@@ -169,7 +169,7 @@ int soundbus_add_one(struct soundbus_dev *dev)
 
        /* sanity checks */
        if (!dev->attach_codec ||
-           !dev->ofdev.node ||
+           !dev->ofdev.dev.of_node ||
            dev->pcmname ||
            dev->pcmid != -1) {
                printk(KERN_ERR "soundbus: adding device failed sanity check!\n");