From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751071AbcFDCXh (ORCPT ); Fri, 3 Jun 2016 22:23:37 -0400 Received: from anholt.net ([50.246.234.109]:41823 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750716AbcFDCXg (ORCPT ); Fri, 3 Jun 2016 22:23:36 -0400 From: Eric Anholt To: Vinod Koul Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stephen Warren , Lee Jones , dmaengine@vger.kernel.org, Eric Anholt Subject: [PATCH] dma: bcm2835: Fix compiler warning on arm64. Date: Fri, 3 Jun 2016 19:23:33 -0700 Message-Id: <1465007013-5300-1-git-send-email-eric@anholt.net> X-Mailer: git-send-email 2.8.0.rc3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The min() macro was complaining about mismatched types. The max len is at most SZ_1G, so we can just put it in an unsigned int. Signed-off-by: Eric Anholt --- Vinod, if you ack it, this one would be nice to be able to merge through the -soc tree, so that when we enable of arm64 builds of this driver we don't introduce a new compiler warning. drivers/dma/bcm2835-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index 6149b27c33ad..1fa11fc067c6 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -393,7 +393,7 @@ static void bcm2835_dma_fill_cb_chain_with_sg( unsigned int sg_len) { struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); - size_t max_len = bcm2835_dma_max_frame_length(c); + unsigned int max_len = bcm2835_dma_max_frame_length(c); unsigned int i, len; dma_addr_t addr; struct scatterlist *sgent; -- 2.8.0.rc3