]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
dmaengine: ste_dma40: Cleanup scatterlist layering violations
authorLogan Gunthorpe <logang@deltatee.com>
Tue, 30 May 2017 22:39:17 +0000 (16:39 -0600)
committerVinod Koul <vinod.koul@intel.com>
Thu, 1 Jun 2017 16:39:12 +0000 (22:09 +0530)
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>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/ste_dma40.c

index a6620b671d1d9b4b5b55de388743e1f7091db2c4..c3052fbfd0921422286a25cc719ff3857c17c337 100644 (file)
@@ -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);