Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[deliverable/linux.git] / sound / soc / sh / siu_pcm.c

diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 5cfcc655e95ffe33670c68e0e998e7a1ceec17af..488f9becb44f3a6653dd66a72e1881d8c2168694 100644 (file)
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -330,12 +330,9 @@ 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,16 +357,15 @@ 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;
        }
 
-       param->dma_dev = pdata->dma_dev;
        /* Get DMA channel */
        siu_stream->chan = dma_request_channel(mask, filter, param);
        if (!siu_stream->chan) {