Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e239345f authored Nov 08, 2012 by Bartlomiej Zolnierkiewicz Committed by Vinod Koul Jan 07, 2013

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>

parent b9ee8683

include/linux/dmaengine.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -926,16 +926,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,

net/ipv4/tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1409,7 +1409,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 */