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

Commit ce818013 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Vinod Koul
Browse files

dmaengine: imx-dma: cleanup scatterlist layering violations 



This dma engine driver directly accesses page_link assuming knowledge
that should be contained only in scatterlist.h.

We replace these with calls to sg_chain and sg_assign_page.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarStephen Bates <sbates@raithlin.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Per Förlin <per.forlin@axis.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent ba6ab3b3

drivers/dma/imx-dma.c

+2 −5
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic( 
	sg_init_table(imxdmac->sg_list, periods);



	for (i = 0; i < periods; i++) {

		imxdmac->sg_list[i].page_link = 0;

		sg_assign_page(&imxdmac->sg_list[i], NULL);

		imxdmac->sg_list[i].offset = 0;

		imxdmac->sg_list[i].dma_address = dma_addr;

		sg_dma_len(&imxdmac->sg_list[i]) = period_len;
@@ -896,10 +896,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic( 
	}



	/* close the loop */

	imxdmac->sg_list[periods].offset = 0;

	sg_dma_len(&imxdmac->sg_list[periods]) = 0;

	imxdmac->sg_list[periods].page_link =

		((unsigned long)imxdmac->sg_list | 0x01) & ~0x02;

	sg_chain(imxdmac->sg_list, periods + 1, imxdmac->sg_list);



	desc->type = IMXDMA_DESC_CYCLIC;

	desc->sg = imxdmac->sg_list;