[PATCH v2 2/2] dmaengine: ste_dma40: Cleanup scatterlist layering violations

From	Logan Gunthorpe <logang@deltatee.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 2/2] dmaengine: ste_dma40: Cleanup scatterlist layering violations
Date	2017-05-31 00:40 +0200
Message-ID	<tMXXY-4Lf-9@gated-at.bofh.it> (permalink)
References	<tMXXY-4Lf-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

We replace this access with a call to sg_chain which is equivalent.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Stephen Bates <sbates@raithlin.com>
Acked-by: Linus 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>
---

v2: Splits the patch into two: one per driver

 drivers/dma/ste_dma40.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index a6620b671d1d..c3052fbfd092 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2528,10 +2528,7 @@ dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
 		dma_addr += period_len;
 	}

-	sg[periods].offset = 0;
-	sg_dma_len(&sg[periods]) = 0;
-	sg[periods].page_link =
-		((unsigned long)sg | 0x01) & ~0x02;
+	sg_chain(sg, periods + 1, sg);

 	txd = d40_prep_sg(chan, sg, sg, periods, direction,
 			  DMA_PREP_INTERRUPT);
--
2.11.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2 2/2] dmaengine: ste_dma40: Cleanup scatterlist layering violations Logan Gunthorpe <logang@deltatee.com> - 2017-05-31 00:40 +0200

csiph-web