| From f156d9501c22f41f236ec2470de9f1e9930afa03 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Mon, 10 Dec 2018 16:49:29 -0700 |
| Subject: crypto: ux500 - Use proper enum in cryp_set_dma_transfer |
| |
| [ 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 790f7cadc1ed..efebc484e371 100644 |
| --- a/drivers/crypto/ux500/cryp/cryp_core.c |
| +++ b/drivers/crypto/ux500/cryp/cryp_core.c |
| @@ -555,7 +555,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: |
| @@ -579,7 +579,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 |
| |
