Commit cdf27f37 authored Apr 17, 2012 by Paul Mundt Committed by Mark Brown Apr 18, 2012

ASoC: fsi: update for dmaengine prep_slave_sg fallout.



Leading up to the ->device_prep_slave_sg change in
185ecb5f 'dmaengine: add context
parameter to prep_slave_sg and prep_dma_cyclic' a generic wrapper was
added in place to guard against the API change, though the fsi driver
wasn't updated in the process (presumably its dmaengine support hadn't
been merged yet at the time). This trivially switches over to the new
wrapper and gets it building again.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent a7dbb603

sound/soc/sh/fsi.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1001,11 +1001,10 @@ static void fsi_dma_do_tasklet(unsigned long data)
		sg_dma_address(&sg) = buf;
		sg_dma_len(&sg) = len;

		desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir,
		DMA_PREP_INTERRUPT \|
		DMA_CTRL_ACK);
		desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir,
		DMA_PREP_INTERRUPT \| DMA_CTRL_ACK);
		if (!desc) {
		dev_err(dai->dev, "device_prep_slave_sg() fail\n");
		dev_err(dai->dev, "dmaengine_prep_slave_sg() fail\n");
		return;
		}

Admin message