1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index d28369f7afd2..a3991ab0d67e 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -781,13 +781,18 @@ err_desc_get:
         return NULL;
 }
 
-static void dwc_terminate_all(struct dma_chan *chan)
+static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+                       unsigned long arg)
 {
         struct dw_dma_chan      *dwc = to_dw_dma_chan(chan);
         struct dw_dma           *dw = to_dw_dma(chan->device);
         struct dw_desc          *desc, *_desc;
         LIST_HEAD(list);
 
+        /* Only supports DMA_TERMINATE_ALL */
+        if (cmd != DMA_TERMINATE_ALL)
+                return -ENXIO;
+
         /*
          * This is only called when something went wrong elsewhere, so
          * we don't really care about the data. Just disable the
@@ -810,12 +815,14 @@ static void dwc_terminate_all(struct dma_chan *chan)
         /* Flush all pending and queued descriptors */
         list_for_each_entry_safe(desc, _desc, &list, desc_node)
                 dwc_descriptor_complete(dwc, desc);
+
+        return 0;
 }
 
 static enum dma_status
-dwc_is_tx_complete(struct dma_chan *chan,
-                dma_cookie_t cookie,
-                dma_cookie_t *done, dma_cookie_t *used)
+dwc_tx_status(struct dma_chan *chan,
+              dma_cookie_t cookie,
+              struct dma_tx_state *txstate)
 {
         struct dw_dma_chan      *dwc = to_dw_dma_chan(chan);
         dma_cookie_t            last_used;
@@ -835,10 +842,7 @@ dwc_is_tx_complete(struct dma_chan *chan,
                 ret = dma_async_is_complete(cookie, last_complete, last_used);
         }
 
-        if (done)
-                *done = last_complete;
-        if (used)
-                *used = last_used;
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return ret;
 }
@@ -1338,9 +1342,9 @@ static int __init dw_probe(struct platform_device *pdev)
         dw->dma.device_prep_dma_memcpy = dwc_prep_dma_memcpy;
 
         dw->dma.device_prep_slave_sg = dwc_prep_slave_sg;
-        dw->dma.device_terminate_all = dwc_terminate_all;
+        dw->dma.device_control = dwc_control;
 
-        dw->dma.device_is_tx_complete = dwc_is_tx_complete;
+        dw->dma.device_tx_status = dwc_tx_status;
         dw->dma.device_issue_pending = dwc_issue_pending;
 
         dma_writel(dw, CFG, DW_CFG_DMA_EN);