|
@@ -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;
|
|
|
}
|
|
|
|