diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2013-10-18 13:35:32 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2013-11-14 14:04:38 -0500 |
commit | 54f8d501e842879143e867e70996574a54d1e130 (patch) | |
tree | 1fcd65a5152d330167f5eefba5cc5d514ec91da1 /drivers/dma/ep93xx_dma.c | |
parent | 6f57fd0578dff23a4bd16118f0cb4201bcec91f1 (diff) |
dmaengine: remove DMA unmap from drivers
Remove support for DMA unmapping from drivers as it is no longer
needed (DMA core code is now handling it).
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[djbw: fix up chan2parent() unused warning in drivers/dma/dw/core.c]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ep93xx_dma.c')
-rw-r--r-- | drivers/dma/ep93xx_dma.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index dcd6bf5d3091..cb4bf682a708 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c | |||
@@ -733,28 +733,6 @@ static void ep93xx_dma_advance_work(struct ep93xx_dma_chan *edmac) | |||
733 | spin_unlock_irqrestore(&edmac->lock, flags); | 733 | spin_unlock_irqrestore(&edmac->lock, flags); |
734 | } | 734 | } |
735 | 735 | ||
736 | static void ep93xx_dma_unmap_buffers(struct ep93xx_dma_desc *desc) | ||
737 | { | ||
738 | struct device *dev = desc->txd.chan->device->dev; | ||
739 | |||
740 | if (!(desc->txd.flags & DMA_COMPL_SKIP_SRC_UNMAP)) { | ||
741 | if (desc->txd.flags & DMA_COMPL_SRC_UNMAP_SINGLE) | ||
742 | dma_unmap_single(dev, desc->src_addr, desc->size, | ||
743 | DMA_TO_DEVICE); | ||
744 | else | ||
745 | dma_unmap_page(dev, desc->src_addr, desc->size, | ||
746 | DMA_TO_DEVICE); | ||
747 | } | ||
748 | if (!(desc->txd.flags & DMA_COMPL_SKIP_DEST_UNMAP)) { | ||
749 | if (desc->txd.flags & DMA_COMPL_DEST_UNMAP_SINGLE) | ||
750 | dma_unmap_single(dev, desc->dst_addr, desc->size, | ||
751 | DMA_FROM_DEVICE); | ||
752 | else | ||
753 | dma_unmap_page(dev, desc->dst_addr, desc->size, | ||
754 | DMA_FROM_DEVICE); | ||
755 | } | ||
756 | } | ||
757 | |||
758 | static void ep93xx_dma_tasklet(unsigned long data) | 736 | static void ep93xx_dma_tasklet(unsigned long data) |
759 | { | 737 | { |
760 | struct ep93xx_dma_chan *edmac = (struct ep93xx_dma_chan *)data; | 738 | struct ep93xx_dma_chan *edmac = (struct ep93xx_dma_chan *)data; |
@@ -787,14 +765,7 @@ static void ep93xx_dma_tasklet(unsigned long data) | |||
787 | 765 | ||
788 | /* Now we can release all the chained descriptors */ | 766 | /* Now we can release all the chained descriptors */ |
789 | list_for_each_entry_safe(desc, d, &list, node) { | 767 | list_for_each_entry_safe(desc, d, &list, node) { |
790 | /* | ||
791 | * For the memcpy channels the API requires us to unmap the | ||
792 | * buffers unless requested otherwise. | ||
793 | */ | ||
794 | dma_descriptor_unmap(&desc->txd); | 768 | dma_descriptor_unmap(&desc->txd); |
795 | if (!edmac->chan.private) | ||
796 | ep93xx_dma_unmap_buffers(desc); | ||
797 | |||
798 | ep93xx_dma_desc_put(edmac, desc); | 769 | ep93xx_dma_desc_put(edmac, desc); |
799 | } | 770 | } |
800 | 771 | ||