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

Commit e24b36bd authored by Rabin Vincent's avatar Rabin Vincent Committed by Dan Williams
Browse files

dma40: combine duplicated code in log_sg_to_dev 



Acked-by: default avatarPer Forlin <per.forlin@stericsson.com>
Acked-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 1c4b0927

drivers/dma/ste_dma40_ll.c

+23 −29
Original line number Diff line number Diff line
@@ -385,40 +385,34 @@ int d40_log_sg_to_dev(struct scatterlist *sg, 
	struct d40_log_lli *lli_dst = lli->dst;



	for_each_sg(sg, current_sg, sg_len, i) {

		total_size += sg_dma_len(current_sg);

		dma_addr_t sg_addr = sg_dma_address(current_sg);

		unsigned int len = sg_dma_len(current_sg);

		dma_addr_t src;

		dma_addr_t dst;



		total_size += len;



		if (direction == DMA_TO_DEVICE) {

			lli_src =

				d40_log_buf_to_lli(lli_src,

						   sg_dma_address(current_sg),

						   sg_dma_len(current_sg),

						   lcsp->lcsp1, src_data_width,

						   dst_data_width,

						   true);

			lli_dst =

				d40_log_buf_to_lli(lli_dst,

						   dev_addr,

						   sg_dma_len(current_sg),

						   lcsp->lcsp3, dst_data_width,

						   src_data_width,

						   false);

			src = sg_addr;

			dst = dev_addr;

		} else {

			lli_dst =

				d40_log_buf_to_lli(lli_dst,

						   sg_dma_address(current_sg),

						   sg_dma_len(current_sg),

						   lcsp->lcsp3, dst_data_width,

			src = dev_addr;

			dst = sg_addr;

		}



		lli_src = d40_log_buf_to_lli(lli_src, src, len,

					     lcsp->lcsp1,

					     src_data_width,

						   true);

			lli_src =

				d40_log_buf_to_lli(lli_src,

						   dev_addr,

						   sg_dma_len(current_sg),

						   lcsp->lcsp1, src_data_width,

					     dst_data_width,

						   false);

		}

					     src == sg_addr);



		lli_dst = d40_log_buf_to_lli(lli_dst, dst, len,

					     lcsp->lcsp3,

					     dst_data_width,

					     src_data_width,

					     dst == sg_addr);

	}



	return total_size;

}