[PATCH] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[PATCH] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Paul Mundt]

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>

---

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

Re: [PATCH] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Kuninori Morimoto]

Hi

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

Best regards
---
Kuninori Morimoto

Re: [PATCH] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Kuninori Morimoto]

Hi Paul, Mark

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

This patch is required for current linux kernel, but it Cc:ed to linux-sh ML only.
Who control this? Paul? Mark?

Best regards
---
Kuninori Morimoto

Re: [PATCH] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Mark Brown]

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

On Sun, Apr 15, 2012 at 11:23:58PM -0700, Kuninori Morimoto wrote:

> This patch is required for current linux kernel, but it Cc:ed to linux-sh ML only.
> Who control this? Paul? Mark?

Not me at the minute, I don't have the patch.

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

Re: [PATCH] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Paul Mundt]

On Mon, Apr 16, 2012 at 09:27:02AM +0100, Mark Brown wrote:
> On Sun, Apr 15, 2012 at 11:23:58PM -0700, Kuninori Morimoto wrote:
> 
> > This patch is required for current linux kernel, but it Cc:ed to linux-sh ML only.
> > Who control this? Paul? Mark?
> 
> Not me at the minute, I don't have the patch.

You were Cc'ed on it?

Re: [PATCH] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Mark Brown]

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

On Mon, Apr 16, 2012 at 09:10:45PM +0900, Paul Mundt wrote:
> On Mon, Apr 16, 2012 at 09:27:02AM +0100, Mark Brown wrote:
> > On Sun, Apr 15, 2012 at 11:23:58PM -0700, Kuninori Morimoto wrote:

> > > This patch is required for current linux kernel, but it Cc:ed to linux-sh ML only.
> > > Who control this? Paul? Mark?

> > Not me at the minute, I don't have the patch.

> You were Cc'ed on it?

That was in the past.  I currently don't have it.  Probably I didn't do
anything with it as it wasn't sent as an ALSA patch (no CC to either the
list or Liam) so it will have looked like you were just CCing for info.
If you can resend I'll apply.

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

[PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[kuninori.morimoto.gx]

From: Paul Mundt <lethal@linux-sh.org>

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>
---
Nothing happened on ALSA ML.
So I forward this patch.
I added my Acked-by on it.

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

[PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[kuninori.morimoto.gx]

From: Paul Mundt <lethal@linux-sh.org>

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>
---
Nothing happened on ALSA ML.
So I forward this patch.
I added my Acked-by on it.

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

Re: [PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Mark Brown]

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

On Tue, Apr 17, 2012 at 07:13:04PM -0700, kuninori.morimoto.gx@renesas.com wrote:
> 
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> Nothing happened on ALSA ML.
> So I forward this patch.
> I added my Acked-by on it.

I've applied this since I can see Paul's original version in the archive
but when forwarding patches for someone else you should sign off rather
than ack the patch - signoff is mostly a statement saying "I know this
is OK legally" and so everyone who forwards the patch is supposed to add
one.

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

Re: [PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout.

[Mark Brown]

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

On Tue, Apr 17, 2012 at 07:13:04PM -0700, kuninori.morimoto.gx@renesas.com wrote:
> 
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> Nothing happened on ALSA ML.
> So I forward this patch.
> I added my Acked-by on it.

I've applied this since I can see Paul's original version in the archive
but when forwarding patches for someone else you should sign off rather
than ack the patch - signoff is mostly a statement saying "I know this
is OK legally" and so everyone who forwards the patch is supposed to add
one.

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