diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-09-06 19:25:10 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-09-06 19:25:10 +0300 |
| commit | 41bd0314fa3a458bee7ad768d079e681316332e7 (patch) | |
| tree | 09a6bb5a1d83b99e004fc6d798882e0bf014d261 /include/linux/dmaengine.h | |
| parent | 346ea25e811b1e260fde7a446aa18833ca7e7b79 (diff) | |
| parent | 3eeb5156362bd756859e8c84ceb2c22e1d4ef652 (diff) | |
| download | linux-41bd0314fa3a458bee7ad768d079e681316332e7.tar.xz | |
Merge branch 'topic/dmatest' into for-linus
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index dd4de1d40166..8319101170fc 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -68,7 +68,6 @@ enum dma_transaction_type { DMA_MEMSET, DMA_MEMSET_SG, DMA_INTERRUPT, - DMA_SG, DMA_PRIVATE, DMA_ASYNC_TX, DMA_SLAVE, @@ -775,11 +774,6 @@ struct dma_device { unsigned int nents, int value, unsigned long flags); struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)( struct dma_chan *chan, unsigned long flags); - struct dma_async_tx_descriptor *(*device_prep_dma_sg)( - struct dma_chan *chan, - struct scatterlist *dst_sg, unsigned int dst_nents, - struct scatterlist *src_sg, unsigned int src_nents, - unsigned long flags); struct dma_async_tx_descriptor *(*device_prep_slave_sg)( struct dma_chan *chan, struct scatterlist *sgl, @@ -909,19 +903,6 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_memcpy( len, flags); } -static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_sg( - struct dma_chan *chan, - struct scatterlist *dst_sg, unsigned int dst_nents, - struct scatterlist *src_sg, unsigned int src_nents, - unsigned long flags) -{ - if (!chan || !chan->device || !chan->device->device_prep_dma_sg) - return NULL; - - return chan->device->device_prep_dma_sg(chan, dst_sg, dst_nents, - src_sg, src_nents, flags); -} - /** * dmaengine_terminate_all() - Terminate all active DMA transfers * @chan: The channel for which to terminate the transfers |