ASoC: Davinci: Fix race with cpu_dai->dma_data

This patch removes references to cpu_dai->dma_data.
It makes struct davinci_pcm_dma_params part of
struct davinci_mcbsp_dev or struct davinci_audio_dev.

It removes the unused name variable from davinci_pcm_dma_params.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 554354c1cc2f..9d179cc88f7b 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -39,10 +39,15 @@ enum {
 };
 
 struct davinci_audio_dev {
+        /*
+         * dma_params must be first because rtd->dai->cpu_dai->private_data
+         * is cast to a pointer of an array of struct davinci_pcm_dma_params in
+         * davinci_pcm_open.
+         */
+        struct davinci_pcm_dma_params dma_params[2];
         void __iomem *base;
         int sample_rate;
         struct clk *clk;
-        struct davinci_pcm_dma_params *dma_params[2];
         unsigned int codec_fmt;
 
         /* McASP specific data */