Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0776ae7b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Dan Williams
Browse files

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: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarJon Mason <jon.mason@intel.com>
Acked-by: default avatarMark Brown <broonie@linaro.org>
[djbw: clean up straggling skip unmap flags in ntb]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 54f8d501

crypto/async_tx/async_memcpy.c

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
		unmap = dmaengine_get_unmap_data(device->dev, 2, GFP_NOIO);



	if (unmap && is_dma_copy_aligned(device, src_offset, dest_offset, len)) {

		unsigned long dma_prep_flags = DMA_COMPL_SKIP_SRC_UNMAP |

					       DMA_COMPL_SKIP_DEST_UNMAP;

		unsigned long dma_prep_flags = 0;



		if (submit->cb_fn)

			dma_prep_flags |= DMA_PREP_INTERRUPT;

crypto/async_tx/async_pq.c

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ do_async_gen_syndrome(struct dma_chan *chan, 
	dma_addr_t dma_dest[2];

	int src_off = 0;



	dma_flags |= DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP;

	if (submit->flags & ASYNC_TX_FENCE)

		dma_flags |= DMA_PREP_FENCE;

crypto/async_tx/async_raid6_recov.c

+2 −6
Original line number Diff line number Diff line
@@ -47,9 +47,7 @@ async_sum_product(struct page *dest, struct page **srcs, unsigned char *coef, 
		struct device *dev = dma->dev;

		dma_addr_t pq[2];

		struct dma_async_tx_descriptor *tx;

		enum dma_ctrl_flags dma_flags = DMA_COMPL_SKIP_SRC_UNMAP |

						DMA_COMPL_SKIP_DEST_UNMAP |

						DMA_PREP_PQ_DISABLE_P;

		enum dma_ctrl_flags dma_flags = DMA_PREP_PQ_DISABLE_P;



		if (submit->flags & ASYNC_TX_FENCE)

			dma_flags |= DMA_PREP_FENCE;
@@ -113,9 +111,7 @@ async_mult(struct page *dest, struct page *src, u8 coef, size_t len, 
		dma_addr_t dma_dest[2];

		struct device *dev = dma->dev;

		struct dma_async_tx_descriptor *tx;

		enum dma_ctrl_flags dma_flags = DMA_COMPL_SKIP_SRC_UNMAP |

						DMA_COMPL_SKIP_DEST_UNMAP |

						DMA_PREP_PQ_DISABLE_P;

		enum dma_ctrl_flags dma_flags = DMA_PREP_PQ_DISABLE_P;



		if (submit->flags & ASYNC_TX_FENCE)

			dma_flags |= DMA_PREP_FENCE;

crypto/async_tx/async_xor.c

+2 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap, 
	dma_async_tx_callback cb_fn_orig = submit->cb_fn;

	void *cb_param_orig = submit->cb_param;

	enum async_tx_flags flags_orig = submit->flags;

	enum dma_ctrl_flags dma_flags;

	enum dma_ctrl_flags dma_flags = 0;

	int src_cnt = unmap->to_cnt;

	int xor_src_cnt;

	dma_addr_t dma_dest = unmap->addr[unmap->to_cnt];
@@ -55,7 +55,6 @@ do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap, 
		/* if we are submitting additional xors, leave the chain open

		 * and clear the callback parameters

		 */

		dma_flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP;

		if (src_cnt > xor_src_cnt) {

			submit->flags &= ~ASYNC_TX_ACK;

			submit->flags |= ASYNC_TX_FENCE;
@@ -284,8 +283,7 @@ async_xor_val(struct page *dest, struct page **src_list, unsigned int offset, 


	if (unmap && src_cnt <= device->max_xor &&

	    is_dma_xor_aligned(device, offset, 0, len)) {

		unsigned long dma_prep_flags = DMA_COMPL_SKIP_SRC_UNMAP |

					       DMA_COMPL_SKIP_DEST_UNMAP;

		unsigned long dma_prep_flags = 0;

		int i;



		pr_debug("%s: (async) len: %zu\n", __func__, len);

drivers/ata/pata_arasan_cf.c

+1 −2
Original line number Diff line number Diff line
@@ -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);