lkml.org 
[lkml]   [2016]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 092/141] dmaengine: bcm2835: fix 64-bit warning
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 4aa819c79bb73f3d1bdf5244d0a0f7f15261504c upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/dma/bcm2835-dma.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/dma/bcm2835-dma.c
    +++ b/drivers/dma/bcm2835-dma.c
    @@ -393,11 +393,12 @@ static void bcm2835_dma_fill_cb_chain_wi
    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 i, len;
    + size_t len, max_len;
    + unsigned int i;
    dma_addr_t addr;
    struct scatterlist *sgent;

    + max_len = bcm2835_dma_max_frame_length(c);
    for_each_sg(sgl, sgent, sg_len, i) {
    for (addr = sg_dma_address(sgent), len = sg_dma_len(sgent);
    len > 0;

    \
     
     \ /
      Last update: 2016-10-06 11:29    [W:4.032 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site