diff options
author | Troy Kisky <troy.kisky@boundarydevices.com> | 2009-11-16 18:52:31 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 08:35:06 -0500 |
commit | 57512c6432783c9695ef54f875f705584c65c733 (patch) | |
tree | 0e376074e7804d0116f2fba36111ac5b736b90e0 /sound/soc/davinci/davinci-i2s.c | |
parent | 357a1db94ecc5b3d605574b164d288cd7dbf8dbd (diff) |
ASoC: DaVinci: remove requirement that dma_params is 1st in structure
Remove requirement that dma_params is 1st in the structures
davinci_audio_dev and davinci_mcbsp_dev.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci/davinci-i2s.c')
-rw-r--r-- | sound/soc/davinci/davinci-i2s.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 2ab809359c08..d336786683b4 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c | |||
@@ -98,11 +98,6 @@ enum { | |||
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct davinci_mcbsp_dev { | 100 | struct davinci_mcbsp_dev { |
101 | /* | ||
102 | * dma_params must be first because rtd->dai->cpu_dai->private_data | ||
103 | * is cast to a pointer of an array of struct davinci_pcm_dma_params in | ||
104 | * davinci_pcm_open. | ||
105 | */ | ||
106 | struct davinci_pcm_dma_params dma_params[2]; | 101 | struct davinci_pcm_dma_params dma_params[2]; |
107 | void __iomem *base; | 102 | void __iomem *base; |
108 | #define MOD_DSP_A 0 | 103 | #define MOD_DSP_A 0 |
@@ -549,6 +544,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) | |||
549 | dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start; | 544 | dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start; |
550 | 545 | ||
551 | davinci_i2s_dai.private_data = dev; | 546 | davinci_i2s_dai.private_data = dev; |
547 | davinci_i2s_dai.dma_data = dev->dma_params; | ||
552 | ret = snd_soc_register_dai(&davinci_i2s_dai); | 548 | ret = snd_soc_register_dai(&davinci_i2s_dai); |
553 | if (ret != 0) | 549 | if (ret != 0) |
554 | goto err_free_mem; | 550 | goto err_free_mem; |