| From d6964a7fc8d9cfbc0257030e420ed6dddc4f9a87 Mon Sep 17 00:00:00 2001 |
| From: Paul Mundt <lethal@linux-sh.org> |
| Date: Tue, 17 Apr 2012 19:13:04 -0700 |
| Subject: ASoC: fsi: update for dmaengine prep_slave_sg fallout. |
| |
| Leading up to the ->device_prep_slave_sg change in |
| 185ecb5f4fd43911c35956d4cc7d94a1da30417f '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> |
| (cherry picked from commit cdf27f373781d8740b874b0b5c18142df32ebb52) |
| |
| N.B: This is not present in mainline yet |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| sound/soc/sh/fsi.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c |
| index 378cc5b..74ed2df 100644 |
| --- a/sound/soc/sh/fsi.c |
| +++ b/sound/soc/sh/fsi.c |
| @@ -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; |
| } |
| |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |
