Commit 70390678 authored Sep 11, 2018 by Nathan Chancellor Committed by Greg Kroah-Hartman Nov 25, 2019

dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction



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

parent 594bc9ac

include/linux/platform_data/dma-ep93xx.h

+1 −1

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