Messages in this thread Patch in this message | | | From | Bartlomiej Zolnierkiewicz <> | Subject | [PATCH resend 2/2] DMA: remove dma_async_memcpy_complete() macro | Date | Wed, 05 Dec 2012 12:22:37 +0100 |
| |
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Subject: [PATCH 2/2] DMA: remove dma_async_memcpy_complete() macro
Just use dma_async_is_tx_complete() directly.
Cc: Vinod Koul <vinod.koul@intel.com> Cc: Dan Williams <djbw@fb.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> --- include/linux/dmaengine.h | 5 +---- net/ipv4/tcp.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
Index: b/include/linux/dmaengine.h =================================================================== --- a/include/linux/dmaengine.h 2012-11-07 16:04:41.028876159 +0100 +++ b/include/linux/dmaengine.h 2012-11-07 16:05:22.004876153 +0100 @@ -927,16 +927,13 @@ static inline enum dma_status dma_async_ 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, Index: b/net/ipv4/tcp.c =================================================================== --- a/net/ipv4/tcp.c 2012-11-07 16:04:11.700876163 +0100 +++ b/net/ipv4/tcp.c 2012-11-07 16:04:26.444876161 +0100 @@ -1413,7 +1413,7 @@ static void tcp_service_net_dma(struct s 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 */
| |