aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/imx/imx-pcm-dma-mx2.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index 93272966b848..7bd07d66bf3b 100644
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -72,7 +72,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err)
72{ 72{
73 struct snd_pcm_substream *substream = data; 73 struct snd_pcm_substream *substream = data;
74 struct snd_soc_pcm_runtime *rtd = substream->private_data; 74 struct snd_soc_pcm_runtime *rtd = substream->private_data;
75 struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data; 75 struct imx_pcm_dma_params *dma_params =
76 snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
76 struct snd_pcm_runtime *runtime = substream->runtime; 77 struct snd_pcm_runtime *runtime = substream->runtime;
77 struct imx_pcm_runtime_data *iprtd = runtime->private_data; 78 struct imx_pcm_runtime_data *iprtd = runtime->private_data;
78 int ret; 79 int ret;
@@ -101,7 +102,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream)
101 struct imx_pcm_runtime_data *iprtd = runtime->private_data; 102 struct imx_pcm_runtime_data *iprtd = runtime->private_data;
102 int ret; 103 int ret;
103 104
104 dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream); 105 dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
105 106
106 iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH); 107 iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH);
107 if (iprtd->dma < 0) { 108 if (iprtd->dma < 0) {
@@ -211,7 +212,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream)
211 struct imx_pcm_runtime_data *iprtd = runtime->private_data; 212 struct imx_pcm_runtime_data *iprtd = runtime->private_data;
212 int err; 213 int err;
213 214
214 dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream); 215 dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
215 216
216 iprtd->substream = substream; 217 iprtd->substream = substream;
217 iprtd->buf = (unsigned int *)substream->dma_buffer.area; 218 iprtd->buf = (unsigned int *)substream->dma_buffer.area;