iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: siu: prepare for conversion to the shdma base library

Browse Source 
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2012-05-09 17:09:18 +02:00 committed by Vinod Koul
parent d6fa5a4e7a
commit 6f3de8bf33
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/sh/siu_pcm.c
View File

@ -330,12 +330,12 @@ static bool filter(struct dma_chan *chan, void *slave)
{ {
struct sh_dmae_slave *param = slave; struct sh_dmae_slave *param = slave;
pr_debug("%s: slave ID %d\n", __func__, param->slave_id); pr_debug("%s: slave ID %d\n", __func__, param->shdma_slave.slave_id);
if (unlikely(param->dma_dev != chan->device->dev)) if (unlikely(param->dma_dev != chan->device->dev))
return false; return false;
chan->private = param; chan->private = &param->shdma_slave;
return true; return true;
} }
@ -360,12 +360,12 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)
if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) {
siu_stream = &port_info->playback; siu_stream = &port_info->playback;
param = &siu_stream->param; param = &siu_stream->param;
param->slave_id = port ? pdata->dma_slave_tx_b : param->shdma_slave.slave_id = port ? pdata->dma_slave_tx_b :
pdata->dma_slave_tx_a; pdata->dma_slave_tx_a;
} else { } else {
siu_stream = &port_info->capture; siu_stream = &port_info->capture;
param = &siu_stream->param; param = &siu_stream->param;
param->slave_id = port ? pdata->dma_slave_rx_b : param->shdma_slave.slave_id = port ? pdata->dma_slave_rx_b :
pdata->dma_slave_rx_a; pdata->dma_slave_rx_a;
} }