[PATCH 3/3] DMAENGINE: extend the control command to include an arg

Previous thread: [PATCH 2/3] DMAENGINE: DMA40 fix for allocation of logical channel 0 by Linus Walleij on Monday, May 17, 2010 - 3:41 pm. (1 message)

Next thread: [GIT PULL] x86/atomic changes for v2.6.35 by Ingo Molnar on Monday, May 17, 2010 - 3:45 pm. (8 messages)
From: Linus Walleij
Date: Monday, May 17, 2010 - 3:41 pm

This adds an argument to the DMAengine control function, so that
we can later provide control commands that need some external data
passed in through an argument akin to the ioctl() operation
prototype.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
---
 drivers/dma/at_hdmac.c       |    3 ++-
 drivers/dma/coh901318.c      |    3 ++-
 drivers/dma/dw_dmac.c        |    3 ++-
 drivers/dma/fsldma.c         |    2 +-
 drivers/dma/ipu/ipu_idmac.c  |    3 ++-
 drivers/dma/shdma.c          |    3 ++-
 drivers/dma/ste_dma40.c      |    3 ++-
 drivers/dma/timb_dma.c       |    3 ++-
 drivers/dma/txx9dmac.c       |    3 ++-
 drivers/mmc/host/atmel-mci.c |    2 +-
 drivers/serial/sh-sci.c      |    2 +-
 drivers/video/mx3fb.c        |    2 +-
 include/linux/dmaengine.h    |    3 ++-
 sound/soc/txx9/txx9aclc.c    |    7 ++++---
 14 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 6693b13..e8ef137 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -760,7 +760,8 @@ err_desc_get:
 	return NULL;
 }
 
-static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd)
+static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd
+		       unsigned long arg)
 {
 	struct at_dma_chan	*atchan = to_at_dma_chan(chan);
 	struct at_dma		*atdma = to_at_dma(chan->device);
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index 4233440..534cd76 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -1176,7 +1176,8 @@ coh901318_issue_pending(struct dma_chan *chan)
 }
 
 static int
-coh901318_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd)
+coh901318_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+		  unsigned long arg)
 {
 	unsigned long flags;
 	struct coh901318_chan *cohc = to_coh901318_chan(chan);
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 18fb5b4..a3991ab 100644
--- a/drivers/dma/dw_dmac.c
+++ ...
From: Dan Williams
Date: Monday, May 17, 2010 - 4:50 pm

On Mon, May 17, 2010 at 3:41 PM, Linus Walleij

This one required some fixups, but I have made those and pushed the
result out async_tx.git/next along with the other two.

Thanks,
Dan
--

From: Linus Walleij
Date: Monday, May 17, 2010 - 5:23 pm

Thanks, and sorry for the mess, I haven't replicated your regression
compilation test, sadly.

Yours,
Linus Walleij
--

Previous thread: [PATCH 2/3] DMAENGINE: DMA40 fix for allocation of logical channel 0 by Linus Walleij on Monday, May 17, 2010 - 3:41 pm. (1 message)

Next thread: [GIT PULL] x86/atomic changes for v2.6.35 by Ingo Molnar on Monday, May 17, 2010 - 3:45 pm. (8 messages)