ASoC: pxa: remove the dmaengine compat need

As the pxa architecture switched towards the dmaengine slave map, the
old compatibility mechanism to acquire the dma requestor line number and
priority are not needed anymore.

This patch simplifies the dma resource acquisition, using the more
generic function dma_request_slave_channel().

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

4 files changed, 12 insertions, 46 deletions

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 4bc244c40f80..236a63cdaf9f 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -63,28 +63,18 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
         .reset  = pxa2xx_ac97_legacy_reset,
 };
 
-static struct pxad_param pxa2xx_ac97_pcm_out_req = {
-        .prio = PXAD_PRIO_LOWEST,
-        .drcmr = 12,
-};
-
 static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_out = {
         .addr           = __PREG(PCDR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_4_BYTES,
+        .chan_name      = "pcm_pcm_stereo_out",
         .maxburst       = 32,
-        .filter_data    = &pxa2xx_ac97_pcm_out_req,
-};
-
-static struct pxad_param pxa2xx_ac97_pcm_in_req = {
-        .prio = PXAD_PRIO_LOWEST,
-        .drcmr = 11,
 };
 
 static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_in = {
         .addr           = __PREG(PCDR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_4_BYTES,
+        .chan_name      = "pcm_pcm_stereo_in",
         .maxburst       = 32,
-        .filter_data    = &pxa2xx_ac97_pcm_in_req,
 };
 
 static struct snd_pcm *pxa2xx_ac97_pcm;
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index e8da3b8ee721..dcbe7ecc1835 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -125,9 +125,9 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
         if (ret < 0)
                 return ret;
 
-        return snd_dmaengine_pcm_open_request_chan(substream,
-                                        pxad_filter_fn,
-                                        dma_params->filter_data);
+        return snd_dmaengine_pcm_open(
+                substream, dma_request_slave_channel(rtd->cpu_dai->dev,
+                                                     dma_params->chan_name));
 }
 EXPORT_SYMBOL(__pxa2xx_pcm_open);
 
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 5738a0abcd6a..c52b33802bf2 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -68,61 +68,39 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
         .reset  = pxa2xx_ac97_cold_reset,
 };
 
-static struct pxad_param pxa2xx_ac97_pcm_stereo_in_req = {
-        .prio = PXAD_PRIO_LOWEST,
-        .drcmr = 11,
-};
-
 static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_stereo_in = {
         .addr           = __PREG(PCDR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_4_BYTES,
+        .chan_name      = "pcm_pcm_stereo_in",
         .maxburst       = 32,
-        .filter_data    = &pxa2xx_ac97_pcm_stereo_in_req,
-};
-
-static struct pxad_param pxa2xx_ac97_pcm_stereo_out_req = {
-        .prio = PXAD_PRIO_LOWEST,
-        .drcmr = 12,
 };
 
 static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_stereo_out = {
         .addr           = __PREG(PCDR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_4_BYTES,
+        .chan_name      = "pcm_pcm_stereo_out",
         .maxburst       = 32,
-        .filter_data    = &pxa2xx_ac97_pcm_stereo_out_req,
 };
 
-static struct pxad_param pxa2xx_ac97_pcm_aux_mono_out_req = {
-        .prio = PXAD_PRIO_LOWEST,
-        .drcmr = 10,
-};
 static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_aux_mono_out = {
         .addr           = __PREG(MODR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_2_BYTES,
+        .chan_name      = "pcm_aux_mono_out",
         .maxburst       = 16,
-        .filter_data    = &pxa2xx_ac97_pcm_aux_mono_out_req,
 };
 
-static struct pxad_param pxa2xx_ac97_pcm_aux_mono_in_req = {
-        .prio = PXAD_PRIO_LOWEST,
-        .drcmr = 9,
-};
 static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_aux_mono_in = {
         .addr           = __PREG(MODR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_2_BYTES,
+        .chan_name      = "pcm_aux_mono_in",
         .maxburst       = 16,
-        .filter_data    = &pxa2xx_ac97_pcm_aux_mono_in_req,
 };
 
-static struct pxad_param pxa2xx_ac97_pcm_aux_mic_mono_req = {
-        .prio = PXAD_PRIO_LOWEST,
-        .drcmr = 8,
-};
 static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_mic_mono_in = {
         .addr           = __PREG(MCDR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_2_BYTES,
+        .chan_name      = "pcm_aux_mic_mono",
         .maxburst       = 16,
-        .filter_data    = &pxa2xx_ac97_pcm_aux_mic_mono_req,
 };
 
 static int pxa2xx_ac97_hifi_startup(struct snd_pcm_substream *substream,
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 3fb60baf6eab..e7184de0de04 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -82,20 +82,18 @@ static struct pxa_i2s_port pxa_i2s;
 static struct clk *clk_i2s;
 static int clk_ena = 0;
 
-static unsigned long pxa2xx_i2s_pcm_stereo_out_req = 3;
 static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_out = {
         .addr           = __PREG(SADR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_4_BYTES,
+        .chan_name      = "tx",
         .maxburst       = 32,
-        .filter_data    = &pxa2xx_i2s_pcm_stereo_out_req,
 };
 
-static unsigned long pxa2xx_i2s_pcm_stereo_in_req = 2;
 static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_in = {
         .addr           = __PREG(SADR),
         .addr_width     = DMA_SLAVE_BUSWIDTH_4_BYTES,
+        .chan_name      = "rx",
         .maxburst       = 32,
-        .filter_data    = &pxa2xx_i2s_pcm_stereo_in_req,
 };
 
 static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream,