Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine updates from Vinod Koul:
 "This is fairly big pull by my standards as I had missed last merge
  window.  So we have the support for device tree for slave-dmaengine,
  large updates to dw_dmac driver from Andy for reusing on different
  architectures.  Along with this we have fixes on bunch of the drivers"

Fix up trivial conflicts, usually due to #include line movement next to
each other.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
  Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
  ARM: dts: pl330: Add #dma-cells for generic dma binding support
  DMA: PL330: Register the DMA controller with the generic DMA helpers
  DMA: PL330: Add xlate function
  DMA: PL330: Add new pl330 filter for DT case.
  dma: tegra20-apb-dma: remove unnecessary assignment
  edma: do not waste memory for dma_mask
  dma: coh901318: set residue only if dma is in progress
  dma: coh901318: avoid unbalanced locking
  dmaengine.h: remove redundant else keyword
  dma: of-dma: protect list write operation by spin_lock
  dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
  dma: of-dma.c: fix memory leakage
  dw_dmac: apply default dma_mask if needed
  dmaengine: ioat - fix spare sparse complain
  dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
  ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
  dw_dmac: add support for Lynxpoint DMA controllers
  dw_dmac: return proper residue value
  dw_dmac: fill individual length of descriptor
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 7a5ba48c2cc9..47e854fcae24 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1409,10 +1409,10 @@ static void tcp_service_net_dma(struct sock *sk, bool wait)
                 return;
 
         last_issued = tp->ucopy.dma_cookie;
-        dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
+        dma_async_issue_pending(tp->ucopy.dma_chan);
 
         do {
-                if (dma_async_memcpy_complete(tp->ucopy.dma_chan,
+                if (dma_async_is_tx_complete(tp->ucopy.dma_chan,
                                               last_issued, &done,
                                               &used) == DMA_SUCCESS) {
                         /* Safe to free early-copied skbs now */
@@ -1754,7 +1754,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                 tcp_service_net_dma(sk, true);
                                 tcp_cleanup_rbuf(sk, copied);
                         } else
-                                dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
+                                dma_async_issue_pending(tp->ucopy.dma_chan);
                 }
 #endif
                 if (copied >= target) {
@@ -1847,7 +1847,7 @@ do_prequeue:
                                         break;
                                 }
 
-                                dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
+                                dma_async_issue_pending(tp->ucopy.dma_chan);
 
                                 if ((offset + used) == skb->len)
                                         copied_early = true;