diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2012-03-06 17:35:27 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 02:07:14 -0400 |
commit | 96a2af41c78b1fbb1f567a3486bdc63f7b31c5fd (patch) | |
tree | d977c6b2ff1a23dfd523e70315ebe976a3f3f079 /drivers/dma/timb_dma.c | |
parent | f7fbce07c6ce26a25b4e0cb5f241c361fde87901 (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/timb_dma.c')
-rw-r--r-- | drivers/dma/timb_dma.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c index 1845ac9d6e88..6383abbecce6 100644 --- a/drivers/dma/timb_dma.c +++ b/drivers/dma/timb_dma.c | |||
@@ -513,18 +513,11 @@ static enum dma_status td_tx_status(struct dma_chan *chan, dma_cookie_t cookie, | |||
513 | { | 513 | { |
514 | struct timb_dma_chan *td_chan = | 514 | struct timb_dma_chan *td_chan = |
515 | container_of(chan, struct timb_dma_chan, chan); | 515 | container_of(chan, struct timb_dma_chan, chan); |
516 | dma_cookie_t last_used; | 516 | enum dma_status ret; |
517 | dma_cookie_t last_complete; | ||
518 | int ret; | ||
519 | 517 | ||
520 | dev_dbg(chan2dev(chan), "%s: Entry\n", __func__); | 518 | dev_dbg(chan2dev(chan), "%s: Entry\n", __func__); |
521 | 519 | ||
522 | last_complete = chan->completed_cookie; | 520 | ret = dma_cookie_status(chan, cookie, txstate); |
523 | last_used = chan->cookie; | ||
524 | |||
525 | ret = dma_async_is_complete(cookie, last_complete, last_used); | ||
526 | |||
527 | dma_set_tx_state(txstate, last_complete, last_used, 0); | ||
528 | 521 | ||
529 | dev_dbg(chan2dev(chan), | 522 | dev_dbg(chan2dev(chan), |
530 | "%s: exit, ret: %d, last_complete: %d, last_used: %d\n", | 523 | "%s: exit, ret: %d, last_complete: %d, last_used: %d\n", |