dmaengine: remove DMA unmap flags

Remove no longer needed DMA unmap flags:
- DMA_COMPL_SKIP_SRC_UNMAP
- DMA_COMPL_SKIP_DEST_UNMAP
- DMA_COMPL_SRC_UNMAP_SINGLE
- DMA_COMPL_DEST_UNMAP_SINGLE

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Jon Mason <jon.mason@intel.com>
Acked-by: Mark Brown <broonie@linaro.org>
[djbw: clean up straggling skip unmap flags in ntb]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

13 files changed, 18 insertions, 40 deletions

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 853f610af28f..e88690ebfd82 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -396,8 +396,7 @@ dma_xfer(struct arasan_cf_dev *acdev, dma_addr_t src, dma_addr_t dest, u32 len)
         struct dma_async_tx_descriptor *tx;
         struct dma_chan *chan = acdev->dma_chan;
         dma_cookie_t cookie;
-        unsigned long flags = DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP |
-                DMA_COMPL_SKIP_DEST_UNMAP;
+        unsigned long flags = DMA_PREP_INTERRUPT;
         int ret = 0;
 
         tx = chan->device->device_prep_dma_memcpy(chan, dest, src, len, flags);
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index f878c808466e..b69ac3892b86 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -1065,8 +1065,7 @@ dma_async_memcpy_pg_to_pg(struct dma_chan *chan, struct page *dest_pg,
         unmap->addr[1] = dma_map_page(dev->dev, dest_pg, dest_off, len,
                                       DMA_FROM_DEVICE);
         unmap->len = len;
-        flags = DMA_CTRL_ACK | DMA_COMPL_SKIP_SRC_UNMAP |
-                DMA_COMPL_SKIP_DEST_UNMAP;
+        flags = DMA_CTRL_ACK;
         tx = dev->device_prep_dma_memcpy(chan, unmap->addr[1], unmap->addr[0],
                                          len, flags);
 
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index f4a2a25fae31..5791091c13ca 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -599,8 +599,7 @@ static int dmatest_func(void *data)
         /*
          * src and dst buffers are freed by ourselves below
          */
-        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT |
-                DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP;
+        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
 
         while (!kthread_should_stop()
                && !(params->iterations && total_tests >= params->iterations)) {
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index c123e32dbbb0..6fcf741ad91b 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -818,8 +818,7 @@ int ioat_dma_self_test(struct ioatdma_device *device)
 
         dma_src = dma_map_single(dev, src, IOAT_TEST_SIZE, DMA_TO_DEVICE);
         dma_dest = dma_map_single(dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE);
-        flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP |
-                DMA_PREP_INTERRUPT;
+        flags = DMA_PREP_INTERRUPT;
         tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src,
                                                    IOAT_TEST_SIZE, flags);
         if (!tx) {
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
index 43386c171bba..a4798f0cc225 100644
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@ -1279,9 +1279,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
                                            DMA_TO_DEVICE);
         tx = dma->device_prep_dma_xor(dma_chan, dest_dma, dma_srcs,
                                       IOAT_NUM_SRC_TEST, PAGE_SIZE,
-                                      DMA_PREP_INTERRUPT |
-                                      DMA_COMPL_SKIP_SRC_UNMAP |
-                                      DMA_COMPL_SKIP_DEST_UNMAP);
+                                      DMA_PREP_INTERRUPT);
 
         if (!tx) {
                 dev_err(dev, "Self-test xor prep failed\n");
@@ -1342,9 +1340,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
                                            DMA_TO_DEVICE);
         tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs,
                                           IOAT_NUM_SRC_TEST + 1, PAGE_SIZE,
-                                          &xor_val_result, DMA_PREP_INTERRUPT |
-                                          DMA_COMPL_SKIP_SRC_UNMAP |
-                                          DMA_COMPL_SKIP_DEST_UNMAP);
+                                          &xor_val_result, DMA_PREP_INTERRUPT);
         if (!tx) {
                 dev_err(dev, "Self-test zero prep failed\n");
                 err = -ENODEV;
@@ -1389,9 +1385,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
                                            DMA_TO_DEVICE);
         tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs,
                                           IOAT_NUM_SRC_TEST + 1, PAGE_SIZE,
-                                          &xor_val_result, DMA_PREP_INTERRUPT |
-                                          DMA_COMPL_SKIP_SRC_UNMAP |
-                                          DMA_COMPL_SKIP_DEST_UNMAP);
+                                          &xor_val_result, DMA_PREP_INTERRUPT);
         if (!tx) {
                 dev_err(dev, "Self-test 2nd zero prep failed\n");
                 err = -ENODEV;
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 540516ca872c..879ea6fdd1be 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -341,8 +341,7 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
         ctx->xt->dir = DMA_MEM_TO_MEM;
         ctx->xt->src_sgl = false;
         ctx->xt->dst_sgl = true;
-        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT |
-                DMA_COMPL_SKIP_DEST_UNMAP | DMA_COMPL_SKIP_SRC_UNMAP;
+        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
 
         tx = dmadev->device_prep_interleaved_dma(chan, ctx->xt, flags);
         if (tx == NULL) {
diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
index b557caf5b1a4..59a95e3ab0e3 100644
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/media/platform/timblogiw.c
@@ -565,7 +565,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 
         desc = dmaengine_prep_slave_sg(fh->chan,
                 buf->sg, sg_elems, DMA_DEV_TO_MEM,
-                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+                DMA_PREP_INTERRUPT);
         if (!desc) {
                 spin_lock_irq(&fh->queue_lock);
                 list_del_init(&vb->queue);
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 7b56563f8b74..5335104e7c84 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -631,8 +631,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf)
         struct dma_async_tx_descriptor *tx;
         dma_cookie_t cookie;
         dma_addr_t dst, src;
-        unsigned long dma_flags = DMA_COMPL_SKIP_DEST_UNMAP |
-                                  DMA_COMPL_SKIP_SRC_UNMAP;
+        unsigned long dma_flags = 0;
 
         dst_sg = buf->vb.sglist;
         dst_nents = buf->vb.sglen;
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 060feeaf6b3e..2a837cb425d7 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -375,8 +375,7 @@ static int atmel_nand_dma_op(struct mtd_info *mtd, void *buf, int len,
 
         dma_dev = host->dma_chan->device;
 
-        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP |
-                DMA_COMPL_SKIP_DEST_UNMAP;
+        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
 
         phys_addr = dma_map_single(dma_dev->dev, p, len, dir);
         if (dma_mapping_error(dma_dev->dev, phys_addr)) {
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 3dc1a7564d87..8b2752263db9 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -573,8 +573,6 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
         dma_dev = chan->device;
         dma_addr = dma_map_single(dma_dev->dev, buffer, len, direction);
 
-        flags |= DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP;
-
         if (direction == DMA_TO_DEVICE) {
                 dma_src = dma_addr;
                 dma_dst = host->data_pa;
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 0951f7aca1ef..822616e3c375 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -459,8 +459,7 @@ static int ks8842_tx_frame_dma(struct sk_buff *skb, struct net_device *netdev)
                 sg_dma_len(&ctl->sg) += 4 - sg_dma_len(&ctl->sg) % 4;
 
         ctl->adesc = dmaengine_prep_slave_sg(ctl->chan,
-                &ctl->sg, 1, DMA_MEM_TO_DEV,
-                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+                &ctl->sg, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);
         if (!ctl->adesc)
                 return NETDEV_TX_BUSY;
 
@@ -571,8 +570,7 @@ static int __ks8842_start_new_rx_dma(struct net_device *netdev)
                 sg_dma_len(sg) = DMA_BUFFER_SIZE;
 
                 ctl->adesc = dmaengine_prep_slave_sg(ctl->chan,
-                        sg, 1, DMA_DEV_TO_MEM,
-                        DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+                        sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT);
 
                 if (!ctl->adesc)
                         goto out;
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index 222c2baa3a4b..d0222f13d154 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -1037,7 +1037,6 @@ static void ntb_async_rx(struct ntb_queue_entry *entry, void *offset,
         struct dmaengine_unmap_data *unmap;
         dma_cookie_t cookie;
         void *buf = entry->buf;
-        unsigned long flags;
 
         entry->len = len;
 
@@ -1073,10 +1072,9 @@ static void ntb_async_rx(struct ntb_queue_entry *entry, void *offset,
 
         unmap->from_cnt = 1;
 
-        flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP |
-                DMA_PREP_INTERRUPT;
         txd = device->device_prep_dma_memcpy(chan, unmap->addr[1],
-                                             unmap->addr[0], len, flags);
+                                             unmap->addr[0], len,
+                                             DMA_PREP_INTERRUPT);
         if (!txd)
                 goto err_get_unmap;
 
@@ -1266,7 +1264,6 @@ static void ntb_async_tx(struct ntb_transport_qp *qp,
         void __iomem *offset;
         size_t len = entry->len;
         void *buf = entry->buf;
-        unsigned long flags;
 
         offset = qp->tx_mw + qp->tx_max_frame * qp->tx_index;
         hdr = offset + qp->tx_max_frame - sizeof(struct ntb_payload_header);
@@ -1301,10 +1298,8 @@ static void ntb_async_tx(struct ntb_transport_qp *qp,
 
         unmap->to_cnt = 1;
 
-        flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP |
-                DMA_PREP_INTERRUPT;
         txd = device->device_prep_dma_memcpy(chan, dest, unmap->addr[0], len,
-                                            flags);
+                                             DMA_PREP_INTERRUPT);
         if (!txd)
                 goto err_get_unmap;
 
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index b9f0192758d6..6d207afec8cb 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -150,7 +150,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
                                 &dws->tx_sgl,
                                 1,
                                 DMA_MEM_TO_DEV,
-                                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
+                                DMA_PREP_INTERRUPT);
         txdesc->callback = dw_spi_dma_done;
         txdesc->callback_param = dws;
 
@@ -173,7 +173,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
                                 &dws->rx_sgl,
                                 1,
                                 DMA_DEV_TO_MEM,
-                                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
+                                DMA_PREP_INTERRUPT);
         rxdesc->callback = dw_spi_dma_done;
         rxdesc->callback_param = dws;