diff options
author | Alexandre Bounine <alexandre.bounine@idt.com> | 2012-03-08 15:35:13 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-21 09:50:23 -0400 |
commit | 185ecb5f4fd43911c35956d4cc7d94a1da30417f (patch) | |
tree | ebbdb7f15157d19d8af892cd7948d93947d09ec2 /drivers/dma/at_hdmac.c | |
parent | 16052827d98fbc13c31ebad560af4bd53e2b4dd5 (diff) |
dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
Add context parameter to device_prep_slave_sg() and device_prep_dma_cyclic()
interfaces to allow passing client/target specific information associated
with the data transfer.
Modify all affected DMA engine drivers.
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/at_hdmac.c')
-rw-r--r-- | drivers/dma/at_hdmac.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 5d225ddc7698..f24b16e455fd 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
@@ -639,11 +639,12 @@ err_desc_get: | |||
639 | * @sg_len: number of entries in @scatterlist | 639 | * @sg_len: number of entries in @scatterlist |
640 | * @direction: DMA direction | 640 | * @direction: DMA direction |
641 | * @flags: tx descriptor status flags | 641 | * @flags: tx descriptor status flags |
642 | * @context: transaction context (ignored) | ||
642 | */ | 643 | */ |
643 | static struct dma_async_tx_descriptor * | 644 | static struct dma_async_tx_descriptor * |
644 | atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | 645 | atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, |
645 | unsigned int sg_len, enum dma_transfer_direction direction, | 646 | unsigned int sg_len, enum dma_transfer_direction direction, |
646 | unsigned long flags) | 647 | unsigned long flags, void *context) |
647 | { | 648 | { |
648 | struct at_dma_chan *atchan = to_at_dma_chan(chan); | 649 | struct at_dma_chan *atchan = to_at_dma_chan(chan); |
649 | struct at_dma_slave *atslave = chan->private; | 650 | struct at_dma_slave *atslave = chan->private; |
@@ -840,10 +841,12 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc, | |||
840 | * @buf_len: total number of bytes for the entire buffer | 841 | * @buf_len: total number of bytes for the entire buffer |
841 | * @period_len: number of bytes for each period | 842 | * @period_len: number of bytes for each period |
842 | * @direction: transfer direction, to or from device | 843 | * @direction: transfer direction, to or from device |
844 | * @context: transfer context (ignored) | ||
843 | */ | 845 | */ |
844 | static struct dma_async_tx_descriptor * | 846 | static struct dma_async_tx_descriptor * |
845 | atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, | 847 | atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, |
846 | size_t period_len, enum dma_transfer_direction direction) | 848 | size_t period_len, enum dma_transfer_direction direction, |
849 | void *context) | ||
847 | { | 850 | { |
848 | struct at_dma_chan *atchan = to_at_dma_chan(chan); | 851 | struct at_dma_chan *atchan = to_at_dma_chan(chan); |
849 | struct at_dma_slave *atslave = chan->private; | 852 | struct at_dma_slave *atslave = chan->private; |