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>

diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 5cfcc65..3fdc801 100644 (file)
--- 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 = &param->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;
        }