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 267/304] crypto: ux500 - Use proper enum in hash_set_dma_transfer
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 5ac93f808338f4dd465402e91869702eb87db241 ]

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

    drivers/crypto/ux500/hash/hash_core.c:169:4: warning: implicit
    conversion from enumeration type 'enum dma_data_direction' to different
    enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
    direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT);
    ^~~~~~~~~
    1 warning generated.

    dmaengine_prep_slave_sg expects an enum from dma_transfer_direction.
    We know that the only direction supported by this function is
    DMA_TO_DEVICE because of the check at the top of this function so we can
    just use the equivalent value from dma_transfer_direction.

    DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1

    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/hash/hash_core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
    index 633321a8dd03..a0bb8a6eec3f 100644
    --- a/drivers/crypto/ux500/hash/hash_core.c
    +++ b/drivers/crypto/ux500/hash/hash_core.c
    @@ -166,7 +166,7 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg,
    __func__);
    desc = dmaengine_prep_slave_sg(channel,
    ctx->device->dma.sg, ctx->device->dma.sg_len,
    - direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT);
    + DMA_MEM_TO_DEV, DMA_CTRL_ACK | DMA_PREP_INTERRUPT);
    if (!desc) {
    dev_err(ctx->device->dev,
    "%s: dmaengine_prep_slave_sg() failed!\n", __func__);
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:33    [W:4.105 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site