Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[sfrench/cifs-2.6.git] / sound / sparc / cs4231.c

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 079063d8038d943e634988d16388c7649a17ec15..883678ee971c668c803ece591f7b907416ab2317 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2071,12 +2071,12 @@ static int cs4231_ebus_probe(struct platform_device *op)
 static int cs4231_probe(struct platform_device *op)
 {
 #ifdef EBUS_SUPPORT
-       if (!strcmp(op->dev.of_node->parent->name, "ebus"))
+       if (of_node_name_eq(op->dev.of_node->parent, "ebus"))
                return cs4231_ebus_probe(op);
 #endif
 #ifdef SBUS_SUPPORT
-       if (!strcmp(op->dev.of_node->parent->name, "sbus") ||
-           !strcmp(op->dev.of_node->parent->name, "sbi"))
+       if (of_node_name_eq(op->dev.of_node->parent, "sbus") ||
+           of_node_name_eq(op->dev.of_node->parent, "sbi"))
                return cs4231_sbus_probe(op);
 #endif
        return -ENODEV;