aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/bcm2835-dma.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-06-30 08:47:10 -0400
committerVinod Koul <vinod.koul@intel.com>2016-06-30 23:10:00 -0400
commit4aa819c79bb73f3d1bdf5244d0a0f7f15261504c (patch)
treec9759435bb3fa0a9c926180307702237d2acae94 /drivers/dma/bcm2835-dma.c
parent636372281f514af1910f5df5e83bc72b56b4bd15 (diff)
dmaengine: bcm2835: fix 64-bit warning
When building this driver on arm64, we get a harmless type mismatch warning: drivers/dma/bcm2835-dma.c: In function 'bcm2835_dma_fill_cb_chain_with_sg': include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast (void) (&_min1 == &_min2); \ ^ drivers/dma/bcm2835-dma.c:409:21: note: in expansion of macro 'min' cb->cb->length = min(len, max_len); This changes the type of the 'len' variable to size_t, which avoids the problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 388cc7a281c0 ("dmaengine: bcm2835: add slave_sg support to bcm2835-dma") Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/bcm2835-dma.c')
-rw-r--r--drivers/dma/bcm2835-dma.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 9ecb94238aaf..e18dc596cf24 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -393,11 +393,12 @@ static void bcm2835_dma_fill_cb_chain_with_sg(
393 unsigned int sg_len) 393 unsigned int sg_len)
394{ 394{
395 struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); 395 struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
396 size_t max_len = bcm2835_dma_max_frame_length(c); 396 size_t len, max_len;
397 unsigned int i, len; 397 unsigned int i;
398 dma_addr_t addr; 398 dma_addr_t addr;
399 struct scatterlist *sgent; 399 struct scatterlist *sgent;
400 400
401 max_len = bcm2835_dma_max_frame_length(c);
401 for_each_sg(sgl, sgent, sg_len, i) { 402 for_each_sg(sgl, sgent, sg_len, i) {
402 for (addr = sg_dma_address(sgent), len = sg_dma_len(sgent); 403 for (addr = sg_dma_address(sgent), len = sg_dma_len(sgent);
403 len > 0; 404 len > 0;