Merge branch 'topic/compile_test' into for-linus

[cascardo/linux.git] / drivers / dma / ep93xx_dma.c

diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 2ffaca2..ca17e87 100644 (file)
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -1045,11 +1045,11 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 
        first = NULL;
        for_each_sg(sgl, sg, sg_len, i) {
-               size_t sg_len = sg_dma_len(sg);
+               size_t len = sg_dma_len(sg);
 
-               if (sg_len > DMA_MAX_CHAN_BYTES) {
-                       dev_warn(chan2dev(edmac), "too big transfer size %d\n",
-                                sg_len);
+               if (len > DMA_MAX_CHAN_BYTES) {
+                       dev_warn(chan2dev(edmac), "too big transfer size %zu\n",
+                                len);
                        goto fail;
                }
 
@@ -1066,7 +1066,7 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                        desc->src_addr = edmac->runtime_addr;
                        desc->dst_addr = sg_dma_address(sg);
                }
-               desc->size = sg_len;
+               desc->size = len;
 
                if (!first)
                        first = desc;
@@ -1123,7 +1123,7 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
        }
 
        if (period_len > DMA_MAX_CHAN_BYTES) {
-               dev_warn(chan2dev(edmac), "too big period length %d\n",
+               dev_warn(chan2dev(edmac), "too big period length %zu\n",
                         period_len);
                return NULL;
        }