alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout.
       [not found]         ` <20120416121724.GA3219@opensource.wolfsonmicro.com>
@ 2012-04-18  2:13           ` kuninori.morimoto.gx
  2012-04-18  9:06             ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: kuninori.morimoto.gx @ 2012-04-18  2:13 UTC (permalink / raw)
  To: Mark Brown
  Cc: Paul Mundt, Linux-ALSA, Liam Girdwood, Kuninori Morimoto,
	linux-sh


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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout.
  2012-04-18  2:13           ` [PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout kuninori.morimoto.gx
@ 2012-04-18  9:06             ` Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2012-04-18  9:06 UTC (permalink / raw)
  To: kuninori.morimoto.gx
  Cc: Paul Mundt, Linux-ALSA, Liam Girdwood, Kuninori Morimoto,
	linux-sh

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-18  9:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20120330082058.GE26543@linux-sh.org>
     [not found] ` <8762dj9fa4.wl%kuninori.morimoto.gx@renesas.com>
     [not found]   ` <87sjg45h50.wl%kuninori.morimoto.gx@renesas.com>
     [not found]     ` <20120416082702.GC3238@opensource.wolfsonmicro.com>
     [not found]       ` <20120416121044.GD7368@linux-sh.org>
     [not found]         ` <20120416121724.GA3219@opensource.wolfsonmicro.com>
2012-04-18  2:13           ` [PATCH forward] ASoC: fsi: update for dmaengine prep_slave_sg fallout kuninori.morimoto.gx
2012-04-18  9:06             ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).