diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-07-05 06:29:38 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-07-20 01:53:44 -0400 |
commit | 9d051dc79f8fd1854229178476db0534359a3704 (patch) | |
tree | 3bc95d0cbdd11eeaeac72389b61840cbca5c2db0 /sound | |
parent | 341f4dc5dcecbf60f038055db177845b9af480ed (diff) |
ASoC: siu: don't use DMA device for channel filtering
DMA channels are filtered based on slave IDs, no need to additionally filter
on DMA device.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/siu_pcm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 3fdc801eb758..488f9becb44f 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c | |||
@@ -332,9 +332,6 @@ static bool filter(struct dma_chan *chan, void *slave) | |||
332 | 332 | ||
333 | pr_debug("%s: slave ID %d\n", __func__, param->shdma_slave.slave_id); | 333 | pr_debug("%s: slave ID %d\n", __func__, param->shdma_slave.slave_id); |
334 | 334 | ||
335 | if (unlikely(param->dma_dev != chan->device->dev)) | ||
336 | return false; | ||
337 | |||
338 | chan->private = ¶m->shdma_slave; | 335 | chan->private = ¶m->shdma_slave; |
339 | return true; | 336 | return true; |
340 | } | 337 | } |
@@ -369,7 +366,6 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) | |||
369 | pdata->dma_slave_rx_a; | 366 | pdata->dma_slave_rx_a; |
370 | } | 367 | } |
371 | 368 | ||
372 | param->dma_dev = pdata->dma_dev; | ||
373 | /* Get DMA channel */ | 369 | /* Get DMA channel */ |
374 | siu_stream->chan = dma_request_channel(mask, filter, param); | 370 | siu_stream->chan = dma_request_channel(mask, filter, param); |
375 | if (!siu_stream->chan) { | 371 | if (!siu_stream->chan) { |