diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:12:59 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:10:40 -0400 |
commit | cb6dc512b745292eaf123fedf437c211e27fb680 (patch) | |
tree | 56177ae8f827c346b9180aad8723be8e04b50153 /sound/aoa | |
parent | 58f9b0b02414062eaff46716bc04b47d7e79add5 (diff) |
arch/powerpc: Move dma_mask from of_device into pdev_archdata
By moving dma_mask into pdev_archdata, and adding archdata to
struct of_device, it makes it possible to substitute of_device
with struct platform_device, which is a stepping stone to
removing the of_platform bus entirely.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'sound/aoa')
-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 7672b4d145ae..678933721735 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c | |||
@@ -221,9 +221,9 @@ static int i2sbus_add_dev(struct macio_dev *macio, | |||
221 | 221 | ||
222 | mutex_init(&dev->lock); | 222 | mutex_init(&dev->lock); |
223 | spin_lock_init(&dev->low_lock); | 223 | spin_lock_init(&dev->low_lock); |
224 | dev->sound.ofdev.dma_mask = macio->ofdev.dma_mask; | 224 | dev->sound.ofdev.archdata.dma_mask = macio->ofdev.archdata.dma_mask; |
225 | dev->sound.ofdev.dev.of_node = np; | 225 | dev->sound.ofdev.dev.of_node = np; |
226 | dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.dma_mask; | 226 | dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.archdata.dma_mask; |
227 | dev->sound.ofdev.dev.parent = &macio->ofdev.dev; | 227 | dev->sound.ofdev.dev.parent = &macio->ofdev.dev; |
228 | dev->sound.ofdev.dev.release = i2sbus_release_dev; | 228 | dev->sound.ofdev.dev.release = i2sbus_release_dev; |
229 | dev->sound.attach_codec = i2sbus_attach_codec; | 229 | dev->sound.attach_codec = i2sbus_attach_codec; |