diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-12-10 12:34:46 -0700 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-18 18:54:03 +0000 |
commit | a8983d4b0a8c439bddae0c9fd1e8a4cf7c402262 (patch) | |
tree | 3ca552988e191ab91b064de4b817516f661f8e58 /sound/soc/cirrus/ep93xx-pcm.c | |
parent | 6f2032a18969d22740a865e0b4f2e48cf5338f36 (diff) | |
download | blackbird-op-linux-a8983d4b0a8c439bddae0c9fd1e8a4cf7c402262.tar.gz blackbird-op-linux-a8983d4b0a8c439bddae0c9fd1e8a4cf7c402262.zip |
ASoC: ep93xx: remove custom DMA alloc compat function
ep93xx_compat_request_channel() is almost identical to
dmaengine_pcm_compat_request_channel(), with the exception that the
latter:
a) Assumes that the DAI DMA data is a struct snd_dmaengine_dai_dma_data
pointer rather than some custom type.
b) dma_data->filter_data rather than dma_data should be passed to
snd_dmaengine_pcm_request_channel() as the filter data.
Make minor changes to the ep93xx DAI drivers so that those two conditions
are met. This allows removal of the custom .compat_request_channel().
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/cirrus/ep93xx-pcm.c')
-rw-r--r-- | sound/soc/cirrus/ep93xx-pcm.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/soc/cirrus/ep93xx-pcm.c b/sound/soc/cirrus/ep93xx-pcm.c index 198c5405f2ce..ca6698d75736 100644 --- a/sound/soc/cirrus/ep93xx-pcm.c +++ b/sound/soc/cirrus/ep93xx-pcm.c @@ -59,22 +59,9 @@ static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param) return false; } -static struct dma_chan *ep93xx_compat_request_channel( - struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_substream *substream) -{ - struct snd_dmaengine_dai_dma_data *dma_data; - - dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); - - return snd_dmaengine_pcm_request_channel(ep93xx_pcm_dma_filter, - dma_data); -} - static const struct snd_dmaengine_pcm_config ep93xx_dmaengine_pcm_config = { .pcm_hardware = &ep93xx_pcm_hardware, .compat_filter_fn = ep93xx_pcm_dma_filter, - .compat_request_channel = ep93xx_compat_request_channel, .prealloc_buffer_size = 131072, }; |