Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f3de8bf authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Vinod Koul
Browse files

ASoC: siu: prepare for conversion to the shdma base library 



Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent d6fa5a4e

sound/soc/sh/siu_pcm.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}