ASoC: sh: fsi: Build proble in 3.4-rc4

ASoC: sh: fsi: Build proble in 3.4-rc4

[Rafael J. Wysocki]

Hi all,

There is a build problem in sound/soc/sh/fsi.c which seems to be fixed by
the following patch.  I'm unsure if that is the right fix, though.

Thanks,
Rafael


---
 sound/soc/sh/fsi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux/sound/soc/sh/fsi.c
===================================================================
--- linux.orig/sound/soc/sh/fsi.c
+++ linux/sound/soc/sh/fsi.c
@@ -1003,7 +1003,7 @@ static void fsi_dma_do_tasklet(unsigned
 
 	desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir,
 						  DMA_PREP_INTERRUPT |
-						  DMA_CTRL_ACK);
+						  DMA_CTRL_ACK, NULL);
 	if (!desc) {
 		dev_err(dai->dev, "device_prep_slave_sg() fail\n");
 		return;

Re: [alsa-devel] ASoC: sh: fsi: Build proble in 3.4-rc4

[kuninori.morimoto.gx]

Hi Rafael

> There is a build problem in sound/soc/sh/fsi.c which seems to be fixed by
> the following patch.  I'm unsure if that is the right fix, though.

Thank you about this patch.
But this issue was solved by below patch on Mark's/for-3.4 branch

------------------------------------------------
commit cdf27f373781d8740b874b0b5c18142df32ebb52
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Tue Apr 17 19:13:04 2012 -0700

    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>
------------------------------------------------

Re: [alsa-devel] ASoC: sh: fsi: Build proble in 3.4-rc4

[Rafael J. Wysocki]

On Monday, April 23, 2012, kuninori.morimoto.gx@renesas.com wrote:
> 
> Hi Rafael
> 
> > There is a build problem in sound/soc/sh/fsi.c which seems to be fixed by
> > the following patch.  I'm unsure if that is the right fix, though.
> 
> Thank you about this patch.
> But this issue was solved by below patch on Mark's/for-3.4 branch

OK, thanks.

Rafael


> ------------------------------------------------
> commit cdf27f373781d8740b874b0b5c18142df32ebb52
> Author: Paul Mundt <lethal@linux-sh.org>
> Date:   Tue Apr 17 19:13:04 2012 -0700
> 
>     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>
> ------------------------------------------------
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

Re: [alsa-devel] ASoC: sh: fsi: Build proble in 3.4-rc4

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

On Mon, Apr 23, 2012 at 10:02:58PM +0200, Rafael J. Wysocki wrote:
> On Monday, April 23, 2012, kuninori.morimoto.gx@renesas.com wrote:

> > Thank you about this patch.
> > But this issue was solved by below patch on Mark's/for-3.4 branch

> OK, thanks.

The patch should make -rc5 - there was some miscommunication about which
tree it'd be applies on when it was originally posted (I'd thought Paul
had already applied it) and then I was very busy and didn't get round to
sending a pull request in time for -rc4.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]