aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/dmaengine.h
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2012-03-06 17:35:27 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-13 02:07:14 -0400
commit96a2af41c78b1fbb1f567a3486bdc63f7b31c5fd (patch)
treed977c6b2ff1a23dfd523e70315ebe976a3f3f079 /drivers/dma/dmaengine.h
parentf7fbce07c6ce26a25b4e0cb5f241c361fde87901 (diff)
dmaengine: consolidate tx_status functions
Now that we have the completed cookie in the dma_chan structure, we can consolidate the tx_status functions by providing a function to set the txstate structure and returning the DMA status. We also provide a separate helper to set the residue for cookies which are still in progress. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Tested-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Jassi Brar <jassisinghbrar@gmail.com> [imx-sdma.c & mxs-dma.c] Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/dmaengine.h')
-rw-r--r--drivers/dma/dmaengine.h31
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/dma/dmaengine.h b/drivers/dma/dmaengine.h
index 47e099772b8e..1ca5e0e633f4 100644
--- a/drivers/dma/dmaengine.h
+++ b/drivers/dma/dmaengine.h
@@ -45,4 +45,35 @@ static inline void dma_cookie_complete(struct dma_async_tx_descriptor *tx)
45 tx->cookie = 0; 45 tx->cookie = 0;
46} 46}
47 47
48/**
49 * dma_cookie_status - report cookie status
50 * @chan: dma channel
51 * @cookie: cookie we are interested in
52 * @state: dma_tx_state structure to return last/used cookies
53 *
54 * Report the status of the cookie, filling in the state structure if
55 * non-NULL. No locking is required.
56 */
57static inline enum dma_status dma_cookie_status(struct dma_chan *chan,
58 dma_cookie_t cookie, struct dma_tx_state *state)
59{
60 dma_cookie_t used, complete;
61
62 used = chan->cookie;
63 complete = chan->completed_cookie;
64 barrier();
65 if (state) {
66 state->last = complete;
67 state->used = used;
68 state->residue = 0;
69 }
70 return dma_async_is_complete(cookie, complete, used);
71}
72
73static inline void dma_set_residue(struct dma_tx_state *state, u32 residue)
74{
75 if (state)
76 state->residue = residue;
77}
78
48#endif 79#endif