dmaengine: remove dma_async_memcpy_pending() macro

Just use dma_async_issue_pending() directly.

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Dan Williams <djbw@fb.com>

4 files changed, 5 insertions, 7 deletions

diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index eaddfe9db149..736c7714f565 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -546,7 +546,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)
                 goto out_dma_unmap;
         }
 
-        dma_async_memcpy_issue_pending(chan);
+        dma_async_issue_pending(chan);
 
         /* Set the total byte count */
         fpga_set_byte_count(priv->regs, priv->bytes);
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 6b43f8c7b3be..7508cafff103 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -751,7 +751,7 @@ static irqreturn_t data_irq(int irq, void *dev_id)
         submitted = true;
 
         /* Start the DMA Engine */
-        dma_async_memcpy_issue_pending(priv->chan);
+        dma_async_issue_pending(priv->chan);
 
 out:
         /* If no DMA was submitted, re-enable interrupts */
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index be6e95395b11..cd15958d4d1d 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -901,8 +901,6 @@ static inline void dma_async_issue_pending(struct dma_chan *chan)
         chan->device->device_issue_pending(chan);
 }
 
-#define dma_async_memcpy_issue_pending(chan) dma_async_issue_pending(chan)
-
 /**
  * dma_async_is_tx_complete - poll for transaction completion
  * @chan: DMA channel
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 1ca253635f7a..cf949a119a54 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1406,7 +1406,7 @@ 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,
@@ -1744,7 +1744,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) {
@@ -1837,7 +1837,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;