aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/pxa2xx-pcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa/pxa2xx-pcm.c')
-rw-r--r--sound/soc/pxa/pxa2xx-pcm.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index ecff116cb7b0..0aa2d695064a 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -12,10 +12,12 @@
12 12
13#include <linux/dma-mapping.h> 13#include <linux/dma-mapping.h>
14#include <linux/module.h> 14#include <linux/module.h>
15#include <linux/dmaengine.h>
15 16
16#include <sound/core.h> 17#include <sound/core.h>
17#include <sound/soc.h> 18#include <sound/soc.h>
18#include <sound/pxa2xx-lib.h> 19#include <sound/pxa2xx-lib.h>
20#include <sound/dmaengine_pcm.h>
19 21
20#include "../../arm/pxa2xx-pcm.h" 22#include "../../arm/pxa2xx-pcm.h"
21 23
@@ -25,7 +27,7 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
25 struct snd_pcm_runtime *runtime = substream->runtime; 27 struct snd_pcm_runtime *runtime = substream->runtime;
26 struct pxa2xx_runtime_data *prtd = runtime->private_data; 28 struct pxa2xx_runtime_data *prtd = runtime->private_data;
27 struct snd_soc_pcm_runtime *rtd = substream->private_data; 29 struct snd_soc_pcm_runtime *rtd = substream->private_data;
28 struct pxa2xx_pcm_dma_params *dma; 30 struct snd_dmaengine_dai_dma_data *dma;
29 int ret; 31 int ret;
30 32
31 dma = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); 33 dma = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
@@ -39,7 +41,7 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
39 * with different params */ 41 * with different params */
40 if (prtd->params == NULL) { 42 if (prtd->params == NULL) {
41 prtd->params = dma; 43 prtd->params = dma;
42 ret = pxa_request_dma(prtd->params->name, DMA_PRIO_LOW, 44 ret = pxa_request_dma("name", DMA_PRIO_LOW,
43 pxa2xx_pcm_dma_irq, substream); 45 pxa2xx_pcm_dma_irq, substream);
44 if (ret < 0) 46 if (ret < 0)
45 return ret; 47 return ret;
@@ -47,7 +49,7 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
47 } else if (prtd->params != dma) { 49 } else if (prtd->params != dma) {
48 pxa_free_dma(prtd->dma_ch); 50 pxa_free_dma(prtd->dma_ch);
49 prtd->params = dma; 51 prtd->params = dma;
50 ret = pxa_request_dma(prtd->params->name, DMA_PRIO_LOW, 52 ret = pxa_request_dma("name", DMA_PRIO_LOW,
51 pxa2xx_pcm_dma_irq, substream); 53 pxa2xx_pcm_dma_irq, substream);
52 if (ret < 0) 54 if (ret < 0)
53 return ret; 55 return ret;