[PATCH 34/37] sound/sparc: use .dev.of_node instead of .node in struct of_device
in [Kernel]
|
Prev: [PATCH 37/37] arch/sparc: Remove .archdata.of_node and use .of_node in struct device
Next: [PATCH 03/37] of/sparc: use dev->of_node instead of dev->archdata.prom_node
From: Grant Likely on 11 Mar 2010 13:10 ..node is being removed Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca> --- sound/sparc/cs4231.c | 6 +++--- sound/sparc/dbri.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 8d13d93..14cb87c 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -2076,12 +2076,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; diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 1d2e51b..2734c36 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -2650,7 +2650,7 @@ static int __devinit dbri_probe(struct of_device *op, const struct of_device_id printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n", dev, dbri->regs, - dbri->irq, op->node->name[9], dbri->mm.version); + dbri->irq, op->dev.of_node->name[9], dbri->mm.version); dev++; return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |