Commit 8a3c04cc authored Dec 10, 2018 by Nathan Chancellor Committed by Greg Kroah-Hartman Feb 12, 2019

crypto: ux500 - Use proper enum in hash_set_dma_transfer



[ 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>

parent 0515902a

drivers/crypto/ux500/hash/hash_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,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__);