dmaengine: consolidate tx_status functions

[deliverable/linux.git] / drivers / dma / ppc4xx / adma.c

diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 40082ec8326ca47178f5331a2856e940114d6e3b..86239ea01898b840661ea968e8885592ea00b8c8 100644 (file)
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -2150,22 +2150,6 @@ static int ppc440spe_adma_alloc_chan_resources(struct dma_chan *chan)
        return (i > 0) ? i : -ENOMEM;
 }
 
-/**
- * ppc440spe_desc_assign_cookie - assign a cookie
- */
-static dma_cookie_t ppc440spe_desc_assign_cookie(
-               struct ppc440spe_adma_chan *chan,
-               struct ppc440spe_adma_desc_slot *desc)
-{
-       dma_cookie_t cookie = chan->common.cookie;
-
-       cookie++;
-       if (cookie < 0)
-               cookie = 1;
-       chan->common.cookie = desc->async_tx.cookie = cookie;
-       return cookie;
-}
-
 /**
  * ppc440spe_rxor_set_region_data -
  */
@@ -2236,8 +2220,7 @@ static dma_cookie_t ppc440spe_adma_tx_submit(struct dma_async_tx_descriptor *tx)
        slots_per_op = group_start->slots_per_op;
 
        spin_lock_bh(&chan->lock);
-
-       cookie = ppc440spe_desc_assign_cookie(chan, sw_desc);
+       cookie = dma_cookie_assign(tx);
 
        if (unlikely(list_empty(&chan->chain))) {
                /* first peer */
@@ -3945,28 +3928,16 @@ static enum dma_status ppc440spe_adma_tx_status(struct dma_chan *chan,
                        dma_cookie_t cookie, struct dma_tx_state *txstate)
 {
        struct ppc440spe_adma_chan *ppc440spe_chan;
-       dma_cookie_t last_used;
-       dma_cookie_t last_complete;
        enum dma_status ret;
 
        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
-       last_used = chan->cookie;
-       last_complete = chan->completed_cookie;
-
-       dma_set_tx_state(txstate, last_complete, last_used, 0);
-
-       ret = dma_async_is_complete(cookie, last_complete, last_used);
+       ret = dma_cookie_status(chan, cookie, txstate);
        if (ret == DMA_SUCCESS)
                return ret;
 
        ppc440spe_adma_slot_cleanup(ppc440spe_chan);
 
-       last_used = chan->cookie;
-       last_complete = chan->completed_cookie;
-
-       dma_set_tx_state(txstate, last_complete, last_used, 0);
-
-       return dma_async_is_complete(cookie, last_complete, last_used);
+       return dma_cookie_status(chan, cookie, txstate);
 }
 
 /**