1 files changed, 3 insertions, 26 deletions

diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index 71e8e775189e..bae6c29f5502 100644
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -419,30 +419,7 @@ txx9dmac_descriptor_complete(struct txx9dmac_chan *dc,
         list_splice_init(&desc->tx_list, &dc->free_list);
         list_move(&desc->desc_node, &dc->free_list);
 
-        if (!ds) {
-                dma_addr_t dmaaddr;
-                if (!(txd->flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
-                        dmaaddr = is_dmac64(dc) ?
-                                desc->hwdesc.DAR : desc->hwdesc32.DAR;
-                        if (txd->flags & DMA_COMPL_DEST_UNMAP_SINGLE)
-                                dma_unmap_single(chan2parent(&dc->chan),
-                                        dmaaddr, desc->len, DMA_FROM_DEVICE);
-                        else
-                                dma_unmap_page(chan2parent(&dc->chan),
-                                        dmaaddr, desc->len, DMA_FROM_DEVICE);
-                }
-                if (!(txd->flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
-                        dmaaddr = is_dmac64(dc) ?
-                                desc->hwdesc.SAR : desc->hwdesc32.SAR;
-                        if (txd->flags & DMA_COMPL_SRC_UNMAP_SINGLE)
-                                dma_unmap_single(chan2parent(&dc->chan),
-                                        dmaaddr, desc->len, DMA_TO_DEVICE);
-                        else
-                                dma_unmap_page(chan2parent(&dc->chan),
-                                        dmaaddr, desc->len, DMA_TO_DEVICE);
-                }
-        }
-
+        dma_descriptor_unmap(txd);
         /*
          * The API requires that no submissions are done from a
          * callback, so we don't need to drop the lock here
@@ -962,8 +939,8 @@ txx9dmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         enum dma_status ret;
 
         ret = dma_cookie_status(chan, cookie, txstate);
-        if (ret == DMA_SUCCESS)
-                return DMA_SUCCESS;
+        if (ret == DMA_COMPLETE)
+                return DMA_COMPLETE;
 
         spin_lock_bh(&dc->lock);
         txx9dmac_scan_descriptors(dc);