diff options
| author |  Grant Likely <grant.likely@secretlab.ca>
| 2010-04-13 16:12:29 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca>
| 2010-05-18 16:10:44 -0600 |
| commit | 61c7a080a5a061c976988fd4b844dfb468dda255 (patch) | |
| tree | 8cb492b73f2755c38a6164d770da34d5af6486a0 /sound/aoa/soundbus/i2sbus/core.c | |
| parent | i2c/of: Allow device node to be passed via i2c_board_info (diff) | |
| download | linux-61c7a080a5a061c976988fd4b844dfb468dda255.tar.gz linux-61c7a080a5a061c976988fd4b844dfb468dda255.tar.bz2 linux-61c7a080a5a061c976988fd4b844dfb468dda255.zip | |
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in
'struct device.of_node' and so are being eliminated. This patch
makes all readers of these elements use device.of_node instead.
(struct of_device *)->node
(struct dev_archdata *)->prom_node (sparc)
(struct dev_archdata *)->of_node (powerpc & microblaze)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'sound/aoa/soundbus/i2sbus/core.c')
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 9d6f3b176ed1..7672b4d145ae 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -221,8 +221,8 @@ static int i2sbus_add_dev(struct macio_dev *macio, mutex_init(&dev->lock); spin_lock_init(&dev->low_lock); - dev->sound.ofdev.node = np; dev->sound.ofdev.dma_mask = macio->ofdev.dma_mask; + dev->sound.ofdev.dev.of_node = np; dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.dma_mask; dev->sound.ofdev.dev.parent = &macio->ofdev.dev; dev->sound.ofdev.dev.release = i2sbus_release_dev; @@ -346,7 +346,7 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) return -ENODEV; } - while ((np = of_get_next_child(dev->ofdev.node, np))) { + while ((np = of_get_next_child(dev->ofdev.dev.of_node, np))) { if (of_device_is_compatible(np, "i2sbus") || of_device_is_compatible(np, "i2s-modem")) { got += i2sbus_add_dev(dev, control, np); |