diff options
Diffstat (limited to 'sound/soc/imx')
-rw-r--r-- | sound/soc/imx/imx-pcm-fiq.c | 8 | ||||
-rw-r--r-- | sound/soc/imx/imx-ssi.c | 7 | ||||
-rw-r--r-- | sound/soc/imx/imx-ssi.h | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c index 413b78da248f..309c59e6fb6c 100644 --- a/sound/soc/imx/imx-pcm-fiq.c +++ b/sound/soc/imx/imx-pcm-fiq.c | |||
@@ -238,12 +238,14 @@ static struct snd_pcm_ops imx_pcm_ops = { | |||
238 | 238 | ||
239 | static int ssi_irq = 0; | 239 | static int ssi_irq = 0; |
240 | 240 | ||
241 | static int imx_pcm_fiq_new(struct snd_card *card, struct snd_soc_dai *dai, | 241 | static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd) |
242 | struct snd_pcm *pcm) | ||
243 | { | 242 | { |
243 | struct snd_card *card = rtd->card->snd_card; | ||
244 | struct snd_soc_dai *dai = rtd->cpu_dai; | ||
245 | struct snd_pcm *pcm = rtd->pcm; | ||
244 | int ret; | 246 | int ret; |
245 | 247 | ||
246 | ret = imx_pcm_new(card, dai, pcm); | 248 | ret = imx_pcm_new(rtd); |
247 | if (ret) | 249 | if (ret) |
248 | return ret; | 250 | return ret; |
249 | 251 | ||
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 5b13feca7537..158a91c1efad 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c | |||
@@ -388,10 +388,11 @@ static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | |||
388 | 388 | ||
389 | static u64 imx_pcm_dmamask = DMA_BIT_MASK(32); | 389 | static u64 imx_pcm_dmamask = DMA_BIT_MASK(32); |
390 | 390 | ||
391 | int imx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | 391 | int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) |
392 | struct snd_pcm *pcm) | ||
393 | { | 392 | { |
394 | 393 | struct snd_card *card = rtd->card->snd_card; | |
394 | struct snd_soc_dai *dai = rtd->cpu_dai; | ||
395 | struct snd_pcm *pcm = rtd->pcm; | ||
395 | int ret = 0; | 396 | int ret = 0; |
396 | 397 | ||
397 | if (!card->dev->dma_mask) | 398 | if (!card->dev->dma_mask) |
diff --git a/sound/soc/imx/imx-ssi.h b/sound/soc/imx/imx-ssi.h index dc8a87530e3e..0a84cec3599e 100644 --- a/sound/soc/imx/imx-ssi.h +++ b/sound/soc/imx/imx-ssi.h | |||
@@ -225,8 +225,7 @@ struct snd_soc_platform *imx_ssi_dma_mx2_init(struct platform_device *pdev, | |||
225 | struct imx_ssi *ssi); | 225 | struct imx_ssi *ssi); |
226 | 226 | ||
227 | int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma); | 227 | int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma); |
228 | int imx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | 228 | int imx_pcm_new(struct snd_soc_pcm_runtime *rtd); |
229 | struct snd_pcm *pcm); | ||
230 | void imx_pcm_free(struct snd_pcm *pcm); | 229 | void imx_pcm_free(struct snd_pcm *pcm); |
231 | 230 | ||
232 | /* | 231 | /* |