aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ste_dma40.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-05-17 16:30:42 -0700
committerDan Williams <dan.j.williams@intel.com>2010-05-17 16:30:42 -0700
commit058276303dbc4ed089c1f7dad0871810b1f5ddf1 (patch)
treedf26ff701721b2a91d61bd29e48bad7cbcedd746 /drivers/dma/ste_dma40.c
parent4aed79b2818e7330b5d00143e4c20bc6555df91f (diff)
downloadkernel_samsung_smdk4412-058276303dbc4ed089c1f7dad0871810b1f5ddf1.zip
kernel_samsung_smdk4412-058276303dbc4ed089c1f7dad0871810b1f5ddf1.tar.gz
kernel_samsung_smdk4412-058276303dbc4ed089c1f7dad0871810b1f5ddf1.tar.bz2
DMAENGINE: extend the control command to include an arg
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. [dan.j.williams@intel.com: fix up some missed conversions] Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ste_dma40.c')
-rw-r--r--drivers/dma/ste_dma40.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 81fec95..c426829 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2065,7 +2065,8 @@ static void d40_issue_pending(struct dma_chan *chan)
spin_unlock_irqrestore(&d40c->lock, flags);
}
-static int d40_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd)
+static int d40_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+ unsigned long arg)
{
unsigned long flags;
struct d40_chan *d40c = container_of(chan, struct d40_chan, chan);