diff options
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 03d68b7e5705..b3b5b38776f0 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -582,10 +582,11 @@ struct dma_device { | |||
| 582 | struct dma_async_tx_descriptor *(*device_prep_slave_sg)( | 582 | struct dma_async_tx_descriptor *(*device_prep_slave_sg)( |
| 583 | struct dma_chan *chan, struct scatterlist *sgl, | 583 | struct dma_chan *chan, struct scatterlist *sgl, |
| 584 | unsigned int sg_len, enum dma_transfer_direction direction, | 584 | unsigned int sg_len, enum dma_transfer_direction direction, |
| 585 | unsigned long flags); | 585 | unsigned long flags, void *context); |
| 586 | struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)( | 586 | struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)( |
| 587 | struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, | 587 | struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, |
| 588 | size_t period_len, enum dma_transfer_direction direction); | 588 | size_t period_len, enum dma_transfer_direction direction, |
| 589 | void *context); | ||
| 589 | struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( | 590 | struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( |
| 590 | struct dma_chan *chan, struct dma_interleaved_template *xt, | 591 | struct dma_chan *chan, struct dma_interleaved_template *xt, |
| 591 | unsigned long flags); | 592 | unsigned long flags); |
| @@ -619,7 +620,8 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single( | |||
| 619 | struct scatterlist sg; | 620 | struct scatterlist sg; |
| 620 | sg_init_one(&sg, buf, len); | 621 | sg_init_one(&sg, buf, len); |
| 621 | 622 | ||
| 622 | return chan->device->device_prep_slave_sg(chan, &sg, 1, dir, flags); | 623 | return chan->device->device_prep_slave_sg(chan, &sg, 1, |
| 624 | dir, flags, NULL); | ||
| 623 | } | 625 | } |
| 624 | 626 | ||
| 625 | static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_sg( | 627 | static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_sg( |
| @@ -627,7 +629,7 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_sg( | |||
| 627 | enum dma_transfer_direction dir, unsigned long flags) | 629 | enum dma_transfer_direction dir, unsigned long flags) |
| 628 | { | 630 | { |
| 629 | return chan->device->device_prep_slave_sg(chan, sgl, sg_len, | 631 | return chan->device->device_prep_slave_sg(chan, sgl, sg_len, |
| 630 | dir, flags); | 632 | dir, flags, NULL); |
| 631 | } | 633 | } |
| 632 | 634 | ||
| 633 | static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic( | 635 | static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic( |
| @@ -635,7 +637,7 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic( | |||
| 635 | size_t period_len, enum dma_transfer_direction dir) | 637 | size_t period_len, enum dma_transfer_direction dir) |
| 636 | { | 638 | { |
| 637 | return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len, | 639 | return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len, |
| 638 | period_len, dir); | 640 | period_len, dir, NULL); |
| 639 | } | 641 | } |
| 640 | 642 | ||
| 641 | static inline int dmaengine_terminate_all(struct dma_chan *chan) | 643 | static inline int dmaengine_terminate_all(struct dma_chan *chan) |
