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>

diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index eaddfe9db149a8f070ec11e5ae78c4e8821f175d..736c7714f5657000a5b82380f2928a1b6c89fe7c 100644 (file)
--- 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 6b43f8c7b3beed7a4afb1a4d7686a5f14b3f0289..7508cafff1039a4d984fae009eec21fdc5863763 100644 (file)
--- 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 d3201e438d1640ff51339514a561fc2347427220..85bc917768a7643a6ebe7f554d335a52f46fc0a6 100644 (file)
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -907,8 +907,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 083092e3aed68db2dd5e9c3fb9cd43759a529abe..0253ab5e03d385dbd6eb893042430d3dc274d7cd 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1408,7 +1408,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,
@@ -1742,7 +1742,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) {
@@ -1835,7 +1835,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;