Merge tag 'dmaengine-5.1-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[zynq/linux.git] / drivers / dma / imx-dma.c

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 4a09af3cd546a4c3569d3ed828fa5407fc5aadc8..00a089e24150ac235877702586e049a48c2e5a2d 100644 (file)
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -278,14 +278,14 @@ static int imxdma_hw_chain(struct imxdma_channel *imxdmac)
 /*
  * imxdma_sg_next - prepare next chunk for scatter-gather DMA emulation
  */
-static inline int imxdma_sg_next(struct imxdma_desc *d)
+static inline void imxdma_sg_next(struct imxdma_desc *d)
 {
        struct imxdma_channel *imxdmac = to_imxdma_chan(d->desc.chan);
        struct imxdma_engine *imxdma = imxdmac->imxdma;
        struct scatterlist *sg = d->sg;
-       unsigned long now;
+       size_t now;
 
-       now = min(d->len, sg_dma_len(sg));
+       now = min_t(size_t, d->len, sg_dma_len(sg));
        if (d->len != IMX_DMA_LENGTH_LOOP)
                d->len -= now;
 
@@ -303,8 +303,6 @@ static inline int imxdma_sg_next(struct imxdma_desc *d)
                 imx_dmav1_readl(imxdma, DMA_DAR(imxdmac->channel)),
                 imx_dmav1_readl(imxdma, DMA_SAR(imxdmac->channel)),
                 imx_dmav1_readl(imxdma, DMA_CNTR(imxdmac->channel)));
-
-       return now;
 }
 
 static void imxdma_enable_hw(struct imxdma_desc *d)