Skip to contentSkip to conversation

ASoC: dmaengine: Use filter_data rather than dma_data for compat requests

PATCH In review Mark Brown 3 participants 3 messages Oct 19, 2013 – Oct 22, 2013

Subsystems (5)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

PATCH 1/1 ASoC: dmaengine: Use filter_data rather than dma_data for compat requests

From: Mark Brown <[email protected]>

When using the legacy filter function channel requests we currently pass the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to be helpful for actual filtering. Since there's already a field in the structure called filter_data clearly intended for use here convert the driver to use that.

All existing users of plain filter functions have been converted to use an explict compat function to override this behaviour except i.MX which is working around this issue in its filter function and is updated to just use filter_data directly here.

---
 sound/soc/fsl/imx-pcm-dma.c           | 4 +---
 sound/soc/soc-generic-dmaengine-pcm.c | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)
sound/soc/fsl/imx-pcm-dma.c +1 -3
index 4dc1296..aee2307 100644
@@ -25,12 +25,10 @@
 
 static bool filter(struct dma_chan *chan, void *param)
 {
-	struct snd_dmaengine_dai_dma_data *dma_data = param;
-
 	if (!imx_dma_is_general_purpose(chan))
 		return false;
 
-	chan->private = dma_data->filter_data;
+	chan->private = param;
 
 	return true;
 }
sound/soc/soc-generic-dmaengine-pcm.c +4 -1
index e29ec3c..17dd379 100644
@@ -126,6 +126,9 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
 	struct snd_pcm_substream *substream)
 {
 	struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+	struct snd_dmaengine_dai_dma_data *dma_data;
+
+	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
 	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
 		return pcm->chan[0];
@@ -134,7 +137,7 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
 		return pcm->config->compat_request_channel(rtd, substream);
 
 	return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,
-		snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
+						 dma_data->filter_data);
 }
 
 static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
Signature · 1 line
1.8.4.rc3
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · Mark Brown

From: Mark Brown <[email protected]>

When using the legacy filter function channel requests we currently pass the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to be helpful for actual filtering. Since there's already a field in the structure called filter_data clearly intended for use here convert the driver to use that.

Quoted 6 lines

All existing users of plain filter functions have been converted to use an explict compat function to override this behaviour except i.MX which is working around this issue in its filter function and is updated to just use filter_data directly here.

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Mark Brown
Quoted 10 lines · Mark Brown

From: Mark Brown <[email protected]>

When using the legacy filter function channel requests we currently pass the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to be helpful for actual filtering. Since there's already a field in the structure called filter_data clearly intended for use here convert the driver to use that.

All existing users of plain filter functions have been converted to use an explict compat function to override this behaviour except i.MX which

typo: explicit

Quoted 4 lines

is working around this issue in its filter function and is updated to just use filter_data directly here.

Quoted 47 lines
---
 sound/soc/fsl/imx-pcm-dma.c           | 4 +---
 sound/soc/soc-generic-dmaengine-pcm.c | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)
sound/soc/fsl/imx-pcm-dma.c +1 -3
index 4dc1296..aee2307 100644
@@ -25,12 +25,10 @@
 
 static bool filter(struct dma_chan *chan, void *param)
 {
-	struct snd_dmaengine_dai_dma_data *dma_data = param;
-
 	if (!imx_dma_is_general_purpose(chan))
 		return false;
 
-	chan->private = dma_data->filter_data;
+	chan->private = param;
 
 	return true;
 }
sound/soc/soc-generic-dmaengine-pcm.c +4 -1
index e29ec3c..17dd379 100644
@@ -126,6 +126,9 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
 	struct snd_pcm_substream *substream)
 {
 	struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+	struct snd_dmaengine_dai_dma_data *dma_data;
+
+	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
 	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
 		return pcm->chan[0];
@@ -134,7 +137,7 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
 		return pcm->config->compat_request_channel(rtd, substream);
 
 	return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,
-		snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
+						 dma_data->filter_data);
 }
 
 static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)