1 files changed, 9 insertions, 28 deletions

diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 823f58179f9d..65c0495a6d40 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -25,6 +25,8 @@
 #include <linux/module.h>
 #include <linux/pch_dma.h>
 
+#include "dmaengine.h"
+
 #define DRV_NAME "pch-dma"
 
 #define DMA_CTL0_DISABLE                0x0
@@ -105,7 +107,6 @@ struct pch_dma_chan {
 
         spinlock_t              lock;
 
-        dma_cookie_t            completed_cookie;
         struct list_head        active_list;
         struct list_head        queue;
         struct list_head        free_list;
@@ -416,20 +417,6 @@ static void pdc_advance_work(struct pch_dma_chan *pd_chan)
         }
 }
 
-static dma_cookie_t pdc_assign_cookie(struct pch_dma_chan *pd_chan,
-                                      struct pch_dma_desc *desc)
-{
-        dma_cookie_t cookie = pd_chan->chan.cookie;
-
-        if (++cookie < 0)
-                cookie = 1;
-
-        pd_chan->chan.cookie = cookie;
-        desc->txd.cookie = cookie;
-
-        return cookie;
-}
-
 static dma_cookie_t pd_tx_submit(struct dma_async_tx_descriptor *txd)
 {
         struct pch_dma_desc *desc = to_pd_desc(txd);
@@ -437,7 +424,7 @@ static dma_cookie_t pd_tx_submit(struct dma_async_tx_descriptor *txd)
         dma_cookie_t cookie;
 
         spin_lock(&pd_chan->lock);
-        cookie = pdc_assign_cookie(pd_chan, desc);
+        cookie = dma_cookie_assign(txd);
 
         if (list_empty(&pd_chan->active_list)) {
                 list_add_tail(&desc->desc_node, &pd_chan->active_list);
@@ -544,7 +531,7 @@ static int pd_alloc_chan_resources(struct dma_chan *chan)
         spin_lock_irq(&pd_chan->lock);
         list_splice(&tmp_list, &pd_chan->free_list);
         pd_chan->descs_allocated = i;
-        pd_chan->completed_cookie = chan->cookie = 1;
+        dma_cookie_init(chan);
         spin_unlock_irq(&pd_chan->lock);
 
         pdc_enable_irq(chan, 1);
@@ -578,19 +565,12 @@ static enum dma_status pd_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
                                     struct dma_tx_state *txstate)
 {
         struct pch_dma_chan *pd_chan = to_pd_chan(chan);
-        dma_cookie_t last_used;
-        dma_cookie_t last_completed;
-        int ret;
+        enum dma_status ret;
 
         spin_lock_irq(&pd_chan->lock);
-        last_completed = pd_chan->completed_cookie;
-        last_used = chan->cookie;
+        ret = dma_cookie_status(chan, cookie, txstate);
         spin_unlock_irq(&pd_chan->lock);
 
-        ret = dma_async_is_complete(cookie, last_completed, last_used);
-
-        dma_set_tx_state(txstate, last_completed, last_used, 0);
-
         return ret;
 }
 
@@ -607,7 +587,8 @@ static void pd_issue_pending(struct dma_chan *chan)
 
 static struct dma_async_tx_descriptor *pd_prep_slave_sg(struct dma_chan *chan,
                         struct scatterlist *sgl, unsigned int sg_len,
-                        enum dma_transfer_direction direction, unsigned long flags)
+                        enum dma_transfer_direction direction, unsigned long flags,
+                        void *context)
 {
         struct pch_dma_chan *pd_chan = to_pd_chan(chan);
         struct pch_dma_slave *pd_slave = chan->private;
@@ -932,7 +913,7 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
                 struct pch_dma_chan *pd_chan = &pd->channels[i];
 
                 pd_chan->chan.device = &pd->dma;
-                pd_chan->chan.cookie = 1;
+                dma_cookie_init(&pd_chan->chan);
 
                 pd_chan->membase = &regs->desc[i];