lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 031/122] dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 9524d6b265f9b2b9a61fceb2ee2ce1c2a83e39ca ]

    Clang warns when implicitly converting from one enumerated type to
    another. Avoid this by using the equivalent value from the expected
    type.

    In file included from drivers/dma/ep93xx_dma.c:30:
    ./include/linux/platform_data/dma-ep93xx.h:88:10: warning: implicit
    conversion from enumeration type 'enum dma_data_direction' to different
    enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
    return DMA_NONE;
    ~~~~~~ ^~~~~~~~
    1 warning generated.

    Reported-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/platform_data/dma-ep93xx.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/linux/platform_data/dma-ep93xx.h b/include/linux/platform_data/dma-ep93xx.h
    index f8f1f6b952a62..eb9805bb3fe8a 100644
    --- a/include/linux/platform_data/dma-ep93xx.h
    +++ b/include/linux/platform_data/dma-ep93xx.h
    @@ -85,7 +85,7 @@ static inline enum dma_transfer_direction
    ep93xx_dma_chan_direction(struct dma_chan *chan)
    {
    if (!ep93xx_dma_chan_is_m2p(chan))
    - return DMA_NONE;
    + return DMA_TRANS_NONE;

    /* even channels are for TX, odd for RX */
    return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 12:15    [W:4.053 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site