dmaengine: remove dma_async_memcpy_complete() macro

Just use dma_async_is_tx_complete() 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/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 85bc917768a7643a6ebe7f554d335a52f46fc0a6..1750e09dbb229f9e5d15f3655647aff0e9048e3b 100644 (file)
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -932,16 +932,13 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan,
        return status;
 }
 
-#define dma_async_memcpy_complete(chan, cookie, last, used)\
-       dma_async_is_tx_complete(chan, cookie, last, used)
-
 /**
  * dma_async_is_complete - test a cookie against chan state
  * @cookie: transaction identifier to test status of
  * @last_complete: last know completed transaction
  * @last_used: last cookie value handed out
  *
- * dma_async_is_complete() is used in dma_async_memcpy_complete()
+ * dma_async_is_complete() is used in dma_async_is_tx_complete()
  * the test logic is separated for lightweight testing of multiple cookies
  */
 static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 0253ab5e03d385dbd6eb893042430d3dc274d7cd..d86dd3b2d7613a705ab1f761bf2f0d4d87d34ccb 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1411,7 +1411,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait)
        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 */