diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2012-11-08 04:59:54 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-01-08 01:05:09 -0500 |
commit | b9ee86830f34737a08deead93872a79a37419a13 (patch) | |
tree | a91ca2b9fd0389828b4a1cec69cdc53383a7631a /net/ipv4/tcp.c | |
parent | 06eeb114026804a9a9cb83eaeb00e24aaa40ba0b (diff) |
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>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
1406 | return; | 1406 | return; |
1407 | 1407 | ||
1408 | last_issued = tp->ucopy.dma_cookie; | 1408 | last_issued = tp->ucopy.dma_cookie; |
1409 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1409 | dma_async_issue_pending(tp->ucopy.dma_chan); |
1410 | 1410 | ||
1411 | do { | 1411 | do { |
1412 | if (dma_async_memcpy_complete(tp->ucopy.dma_chan, | 1412 | 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, | |||
1744 | tcp_service_net_dma(sk, true); | 1744 | tcp_service_net_dma(sk, true); |
1745 | tcp_cleanup_rbuf(sk, copied); | 1745 | tcp_cleanup_rbuf(sk, copied); |
1746 | } else | 1746 | } else |
1747 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1747 | dma_async_issue_pending(tp->ucopy.dma_chan); |
1748 | } | 1748 | } |
1749 | #endif | 1749 | #endif |
1750 | if (copied >= target) { | 1750 | if (copied >= target) { |
@@ -1837,7 +1837,7 @@ do_prequeue: | |||
1837 | break; | 1837 | break; |
1838 | } | 1838 | } |
1839 | 1839 | ||
1840 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1840 | dma_async_issue_pending(tp->ucopy.dma_chan); |
1841 | 1841 | ||
1842 | if ((offset + used) == skb->len) | 1842 | if ((offset + used) == skb->len) |
1843 | copied_early = true; | 1843 | copied_early = true; |