[PATCH 6/7] ASoC: SIU: prepare for conversion to simple DMA
From: Guennadi Liakhovetski <hidden>
Date: 2012-01-18 10:22:48
Also in:
alsa-devel, lkml
Subsystem:
sound, sound - soc layer / dynamic audio power management (asoc), the rest · Maintainers:
Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Linus Torvalds
Signed-off-by: Guennadi Liakhovetski <redacted> --- 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 f8f6816..6390fec 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->simple_slave.slave_id); if (unlikely(param->dma_dev != chan->device->dev)) return false; - chan->private = param; + chan->private = ¶m->simple_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->simple_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->simple_slave.slave_id = port ? pdata->dma_slave_rx_b : pdata->dma_slave_rx_a; }
--
1.7.2.5