netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH linux-next] dmaengine: add context parameter fixups
@ 2012-03-23 14:00 Alexandre Bounine
  2012-03-24  0:53 ` Mark Brown
  2012-03-24 15:23 ` Fabio Estevam
  0 siblings, 2 replies; 14+ messages in thread
From: Alexandre Bounine @ 2012-03-23 14:00 UTC (permalink / raw)
  To: paul.gortmaker, vinod.koul, dan.j.williams
  Cc: Alexandre Bounine, samuel, lrg, broonie, perex, tiwai,
	linux-kernel, linux-next, netdev, fabio.estevam, alsa-devel

This patch fixes drivers that use device_prep_slave_sg() and
device_prep_dma_cyclic() interfaces and have been missed during the initial
release of interface changing patches.

This patch is based on linux-next-20120322 code tree.
See https://lkml.org/lkml/2012/3/22/339 for build failure report.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/dma/sa11x0-dma.c      |    2 +-
 drivers/net/irda/sa1100_ir.c  |    2 +-
 sound/soc/sh/fsi.c            |    7 +++----
 sound/soc/soc-dmaengine-pcm.c |    2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c
index 16a6b48..ec78cce 100644
--- a/drivers/dma/sa11x0-dma.c
+++ b/drivers/dma/sa11x0-dma.c
@@ -585,7 +585,7 @@ static dma_cookie_t sa11x0_dma_tx_submit(struct dma_async_tx_descriptor *tx)
 
 static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg(
 	struct dma_chan *chan, struct scatterlist *sg, unsigned int sglen,
-	enum dma_transfer_direction dir, unsigned long flags)
+	enum dma_transfer_direction dir, unsigned long flags, void *context)
 {
 	struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
 	struct sa11x0_dma_desc *txd;
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index a0d1913..e250675 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -147,7 +147,7 @@ static void sa1100_irda_dma_start(struct sa1100_buf *buf,
 	struct dma_async_tx_descriptor *desc;
 	struct dma_chan *chan = buf->chan;
 
-	desc = chan->device->device_prep_slave_sg(chan, &buf->sg, 1, dir,
+	desc = dmaengine_prep_slave_sg(chan, &buf->sg, 1, dir,
 			DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 	if (desc) {
 		desc->callback = cb;
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 378cc5b..9e730ad 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;
 	}
 
diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c
index 4420b70..4756952 100644
--- a/sound/soc/soc-dmaengine-pcm.c
+++ b/sound/soc/soc-dmaengine-pcm.c
@@ -143,7 +143,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream)
 	direction = snd_pcm_substream_to_dma_direction(substream);
 
 	prtd->pos = 0;
-	desc = chan->device->device_prep_dma_cyclic(chan,
+	desc = dmaengine_prep_dma_cyclic(chan,
 		substream->runtime->dma_addr,
 		snd_pcm_lib_buffer_bytes(substream),
 		snd_pcm_lib_period_bytes(substream), direction);
-- 
1.7.8.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-03-29 10:59 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-23 14:00 [PATCH linux-next] dmaengine: add context parameter fixups Alexandre Bounine
2012-03-24  0:53 ` Mark Brown
2012-03-24 15:23 ` Fabio Estevam
2012-03-26  5:34   ` Vinod Koul
2012-03-26  9:42     ` Mark Brown
2012-03-26  9:54       ` Vinod Koul
2012-03-26 10:33         ` Mark Brown
2012-03-26 10:48           ` Vinod Koul
2012-03-26 11:01             ` Mark Brown
2012-03-26 11:07               ` Vinod Koul
2012-03-26 13:14         ` Bounine, Alexandre
2012-03-28 15:44       ` Takashi Iwai
2012-03-28 15:51         ` Mark Brown
2012-03-29 10:59           ` Vinod Koul

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