Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...

[cascardo/linux.git] / drivers / dma / dmaengine.c

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index d5d30ed..24bfaf0 100644 (file)
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -1081,110 +1081,6 @@ dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags)
 }
 EXPORT_SYMBOL(dmaengine_get_unmap_data);
 
-/**
- * dma_async_memcpy_pg_to_pg - offloaded copy from page to page
- * @chan: DMA channel to offload copy to
- * @dest_pg: destination page
- * @dest_off: offset in page to copy to
- * @src_pg: source page
- * @src_off: offset in page to copy from
- * @len: length
- *
- * Both @dest_page/@dest_off and @src_page/@src_off must be mappable to a bus
- * address according to the DMA mapping API rules for streaming mappings.
- * Both @dest_page/@dest_off and @src_page/@src_off must stay memory resident
- * (kernel memory or locked user space pages).
- */
-dma_cookie_t
-dma_async_memcpy_pg_to_pg(struct dma_chan *chan, struct page *dest_pg,
-       unsigned int dest_off, struct page *src_pg, unsigned int src_off,
-       size_t len)
-{
-       struct dma_device *dev = chan->device;
-       struct dma_async_tx_descriptor *tx;
-       struct dmaengine_unmap_data *unmap;
-       dma_cookie_t cookie;
-       unsigned long flags;
-
-       unmap = dmaengine_get_unmap_data(dev->dev, 2, GFP_NOWAIT);
-       if (!unmap)
-               return -ENOMEM;
-
-       unmap->to_cnt = 1;
-       unmap->from_cnt = 1;
-       unmap->addr[0] = dma_map_page(dev->dev, src_pg, src_off, len,
-                                     DMA_TO_DEVICE);
-       unmap->addr[1] = dma_map_page(dev->dev, dest_pg, dest_off, len,
-                                     DMA_FROM_DEVICE);
-       unmap->len = len;
-       flags = DMA_CTRL_ACK;
-       tx = dev->device_prep_dma_memcpy(chan, unmap->addr[1], unmap->addr[0],
-                                        len, flags);
-
-       if (!tx) {
-               dmaengine_unmap_put(unmap);
-               return -ENOMEM;
-       }
-
-       dma_set_unmap(tx, unmap);
-       cookie = tx->tx_submit(tx);
-       dmaengine_unmap_put(unmap);
-
-       preempt_disable();
-       __this_cpu_add(chan->local->bytes_transferred, len);
-       __this_cpu_inc(chan->local->memcpy_count);
-       preempt_enable();
-
-       return cookie;
-}
-EXPORT_SYMBOL(dma_async_memcpy_pg_to_pg);
-
-/**
- * dma_async_memcpy_buf_to_buf - offloaded copy between virtual addresses
- * @chan: DMA channel to offload copy to
- * @dest: destination address (virtual)
- * @src: source address (virtual)
- * @len: length
- *
- * Both @dest and @src must be mappable to a bus address according to the
- * DMA mapping API rules for streaming mappings.
- * Both @dest and @src must stay memory resident (kernel memory or locked
- * user space pages).
- */
-dma_cookie_t
-dma_async_memcpy_buf_to_buf(struct dma_chan *chan, void *dest,
-                           void *src, size_t len)
-{
-       return dma_async_memcpy_pg_to_pg(chan, virt_to_page(dest),
-                                        (unsigned long) dest & ~PAGE_MASK,
-                                        virt_to_page(src),
-                                        (unsigned long) src & ~PAGE_MASK, len);
-}
-EXPORT_SYMBOL(dma_async_memcpy_buf_to_buf);
-
-/**
- * dma_async_memcpy_buf_to_pg - offloaded copy from address to page
- * @chan: DMA channel to offload copy to
- * @page: destination page
- * @offset: offset in page to copy to
- * @kdata: source address (virtual)
- * @len: length
- *
- * Both @page/@offset and @kdata must be mappable to a bus address according
- * to the DMA mapping API rules for streaming mappings.
- * Both @page/@offset and @kdata must stay memory resident (kernel memory or
- * locked user space pages)
- */
-dma_cookie_t
-dma_async_memcpy_buf_to_pg(struct dma_chan *chan, struct page *page,
-                          unsigned int offset, void *kdata, size_t len)
-{
-       return dma_async_memcpy_pg_to_pg(chan, page, offset,
-                                        virt_to_page(kdata),
-                                        (unsigned long) kdata & ~PAGE_MASK, len);
-}
-EXPORT_SYMBOL(dma_async_memcpy_buf_to_pg);
-
 void dma_async_tx_descriptor_init(struct dma_async_tx_descriptor *tx,
        struct dma_chan *chan)
 {