diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-05-09 17:09:18 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-07-13 05:43:08 +0200 |
| commit | 6f3de8bf33902a91b83744c76fea7de3cd0328cc (patch) | |
| tree | 4ae8b4defe335f6300e93c97f1dfb3cebd1315d7 /sound | |
| parent | serial: sh-sci: prepare for conversion to the shdma base library (diff) | |
| download | linux-6f3de8bf33902a91b83744c76fea7de3cd0328cc.tar.xz linux-6f3de8bf33902a91b83744c76fea7de3cd0328cc.zip | |
ASoC: siu: prepare for conversion to the shdma base library
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/siu_pcm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 5cfcc655e95f..3fdc801eb758 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -330,12 +330,12 @@ static bool filter(struct dma_chan *chan, void *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)) return false; - chan->private = param; + chan->private = ¶m->shdma_slave; return true; } @@ -360,12 +360,12 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { siu_stream = &port_info->playback; 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; } else { siu_stream = &port_info->capture; 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; } |