lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.20 266/304] crypto: ux500 - Use proper enum in cryp_set_dma_transfer
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 9d880c5945c748d8edcac30965f3349a602158c4 ]

    Clang warns when one enumerated type is implicitly converted to another:

    drivers/crypto/ux500/cryp/cryp_core.c:559:5: warning: implicit
    conversion from enumeration type 'enum dma_data_direction' to different
    enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
    direction, DMA_CTRL_ACK);
    ^~~~~~~~~
    drivers/crypto/ux500/cryp/cryp_core.c:583:5: warning: implicit
    conversion from enumeration type 'enum dma_data_direction' to different
    enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
    direction,
    ^~~~~~~~~
    2 warnings generated.

    dmaengine_prep_slave_sg expects an enum from dma_transfer_direction.
    Because we know the value of the dma_data_direction enum from the
    switch statement, we can just use the proper value from
    dma_transfer_direction so there is no more conversion.

    DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1
    DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2

    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/ux500/cryp/cryp_core.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
    index d2663a4e1f5e..a92a66b1ff46 100644
    --- a/drivers/crypto/ux500/cryp/cryp_core.c
    +++ b/drivers/crypto/ux500/cryp/cryp_core.c
    @@ -556,7 +556,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
    desc = dmaengine_prep_slave_sg(channel,
    ctx->device->dma.sg_src,
    ctx->device->dma.sg_src_len,
    - direction, DMA_CTRL_ACK);
    + DMA_MEM_TO_DEV, DMA_CTRL_ACK);
    break;

    case DMA_FROM_DEVICE:
    @@ -580,7 +580,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
    desc = dmaengine_prep_slave_sg(channel,
    ctx->device->dma.sg_dst,
    ctx->device->dma.sg_dst_len,
    - direction,
    + DMA_DEV_TO_MEM,
    DMA_CTRL_ACK |
    DMA_PREP_INTERRUPT);

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:33    [W:4.103 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site