Skip to contentSkip to conversation

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

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

Subsystems (3)
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.

---
 sound/soc/soc-generic-dmaengine-pcm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/soc-generic-dmaengine-pcm.c +4 -1
index 99f9495..2eea2e0 100644
@@ -168,6 +168,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];
@@ -176,7 +179,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
#1 lore raw
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.

I think this patch also needs to update sound/soc/fsl/imx-pcm-dma.c

author maintainer
#2 lore raw
Quoted 1 line · Lars-Peter Clausen

I think this patch also needs to update sound/soc/fsl/imx-pcm-dma.c

Yes, I sent a patch for that I think? Or did I forget to post it?