Skip to content

Commit

Permalink
ASoC: dmaengine: Use filter_data rather than dma_data for compat requ…
Browse files Browse the repository at this point in the history
…ests

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 explicit 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.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
  • Loading branch information
Mark Brown committed Oct 24, 2013
1 parent ea73b7d commit 90130d2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 1 addition & 3 deletions sound/soc/fsl/imx-pcm-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 4 additions & 1 deletion sound/soc/soc-generic-dmaengine-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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)
Expand Down

0 comments on commit 90130d2

Please sign in to comment.