aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2013-10-18 13:35:25 -0400
committerDan Williams <dan.j.williams@intel.com>2013-11-14 14:00:39 -0500
commit8971646294bda65f8666b60cb2cb3d5e172c99bf (patch)
treeb3d75fd6c909de400e8028a337d70ca943180c87 /include/linux
parent45c463ae924c62af4aa64ded1ca831f334a1db65 (diff)
async_memcpy: convert to dmaengine_unmap_data
Use the generic unmap object to unmap dma buffers. Cc: Vinod Koul <vinod.koul@intel.com> Cc: Tomasz Figa <t.figa@samsung.com> Cc: Dave Jiang <dave.jiang@intel.com> Reported-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> [bzolnier: add missing unmap->len initialization] [bzolnier: fix whitespace damage] Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [djbw: add DMA_ENGINE=n support] Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dmaengine.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 2fe855a7cab1..3782cdb782a8 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -457,6 +457,7 @@ struct dma_async_tx_descriptor {
457#endif 457#endif
458}; 458};
459 459
460#ifdef CONFIG_DMA_ENGINE
460static inline void dma_set_unmap(struct dma_async_tx_descriptor *tx, 461static inline void dma_set_unmap(struct dma_async_tx_descriptor *tx,
461 struct dmaengine_unmap_data *unmap) 462 struct dmaengine_unmap_data *unmap)
462{ 463{
@@ -464,7 +465,23 @@ static inline void dma_set_unmap(struct dma_async_tx_descriptor *tx,
464 tx->unmap = unmap; 465 tx->unmap = unmap;
465} 466}
466 467
468struct dmaengine_unmap_data *
469dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags);
467void dmaengine_unmap_put(struct dmaengine_unmap_data *unmap); 470void dmaengine_unmap_put(struct dmaengine_unmap_data *unmap);
471#else
472static inline void dma_set_unmap(struct dma_async_tx_descriptor *tx,
473 struct dmaengine_unmap_data *unmap)
474{
475}
476static inline struct dmaengine_unmap_data *
477dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags)
478{
479 return NULL;
480}
481static inline void dmaengine_unmap_put(struct dmaengine_unmap_data *unmap)
482{
483}
484#endif
468 485
469static inline void dma_descriptor_unmap(struct dma_async_tx_descriptor *tx) 486static inline void dma_descriptor_unmap(struct dma_async_tx_descriptor *tx)
470{ 487{