lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.0 230/262] dmaengine: imx-dma: fix warning comparison of distinct pointer types
    Date
    From: Anders Roxell <anders.roxell@linaro.org>

    [ Upstream commit 9227ab5643cb8350449502dd9e3168a873ab0e3b ]

    The warning got introduced by commit 930507c18304 ("arm64: add basic
    Kconfig symbols for i.MX8"). Since it got enabled for arm64. The warning
    haven't been seen before since size_t was 'unsigned int' when built on
    arm32.

    ../drivers/dma/imx-dma.c: In function ‘imxdma_sg_next’:
    ../include/linux/kernel.h:846:29: warning: comparison of distinct pointer types lacks a cast
    (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
    ^~
    ../include/linux/kernel.h:860:4: note: in expansion of macro ‘__typecheck’
    (__typecheck(x, y) && __no_side_effects(x, y))
    ^~~~~~~~~~~
    ../include/linux/kernel.h:870:24: note: in expansion of macro ‘__safe_cmp’
    __builtin_choose_expr(__safe_cmp(x, y), \
    ^~~~~~~~~~
    ../include/linux/kernel.h:879:19: note: in expansion of macro ‘__careful_cmp’
    #define min(x, y) __careful_cmp(x, y, <)
    ^~~~~~~~~~~~~
    ../drivers/dma/imx-dma.c:288:8: note: in expansion of macro ‘min’
    now = min(d->len, sg_dma_len(sg));
    ^~~

    Rework so that we use min_t and pass in the size_t that returns the
    minimum of two values, using the specified type.

    Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
    Acked-by: Olof Johansson <olof@lixom.net>
    Reviewed-by: Fabio Estevam <festevam@gmail.com>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/imx-dma.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
    index 4a09af3cd546..7b9a7fb28bb9 100644
    --- a/drivers/dma/imx-dma.c
    +++ b/drivers/dma/imx-dma.c
    @@ -285,7 +285,7 @@ static inline int imxdma_sg_next(struct imxdma_desc *d)
    struct scatterlist *sg = d->sg;
    unsigned long 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;

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-27 20:15    [W:4.294 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site