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

[safe/jmp/linux-2.6] / sound / sparc / cs4231.c

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 7dcc065..6a4c872 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2075,12 +2075,12 @@ static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_dev
 static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)
 {
 #ifdef EBUS_SUPPORT
-       if (!strcmp(op->node->parent->name, "ebus"))
+       if (!strcmp(op->dev.of_node->parent->name, "ebus"))
                return cs4231_ebus_probe(op, match);
 #endif
 #ifdef SBUS_SUPPORT
-       if (!strcmp(op->node->parent->name, "sbus") ||
-           !strcmp(op->node->parent->name, "sbi"))
+       if (!strcmp(op->dev.of_node->parent->name, "sbus") ||
+           !strcmp(op->dev.of_node->parent->name, "sbi"))
                return cs4231_sbus_probe(op, match);
 #endif
        return -ENODEV;