lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmaengine: remove dma_async_memcpy_complete() macro

Browse Source 
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>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2012-11-08 10:01:01 +00:00
committed by Vinod Koul
parent b9ee86830f
commit e239345f64
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/dmaengine.h
View File

@@ -926,16 +926,13 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan,
return status; 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 * dma_async_is_complete - test a cookie against chan state
* @cookie: transaction identifier to test status of * @cookie: transaction identifier to test status of
* @last_complete: last know completed transaction * @last_complete: last know completed transaction
* @last_used: last cookie value handed out * @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 * the test logic is separated for lightweight testing of multiple cookies
*/ */
static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,

2
net/ipv4/tcp.c
View File

@@ -1409,7 +1409,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait)
dma_async_issue_pending(tp->ucopy.dma_chan); dma_async_issue_pending(tp->ucopy.dma_chan);
do { do {
if (dma_async_memcpy_complete(tp->ucopy.dma_chan, if (dma_async_is_tx_complete(tp->ucopy.dma_chan,
last_issued, &done, last_issued, &done,
&used) == DMA_SUCCESS) { &used) == DMA_SUCCESS) {
/* Safe to free early-copied skbs now */ /* Safe to free early-copied skbs now */