Commit cd7bcc60 authored Jun 19, 2014 by Lars-Peter Clausen Committed by Mark Brown Jun 21, 2014

ASoC: rcar: Fix dma direction type

dmaengine_prep_slave_single() expects a enum dma_transfer_direction and not a
enum dma_data_direction. Since the integer representations of both DMA_TO_DEVICE
and DMA_MEM_TO_DEV aswell as DMA_FROM_DEVICE and DMA_DEV_TO_MEM have the same
value the code worked fine even though it was using the wrong type.

Fixes the following warning from sparse:
sound/soc/sh/rcar/core.c:227:49: warning: mixing different enum types
sound/soc/sh/rcar/core.c:227:49: int enum dma_data_direction versus
sound/soc/sh/rcar/core.c:227:49: int enum dma_transfer_direction

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 7171511e

sound/soc/sh/rcar/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@ int rsnd_dma_init(struct rsnd_priv priv, struct rsnd_dma dma,
		if (ret < 0)
		goto rsnd_dma_init_err;

		dma->dir = is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
		dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
		INIT_WORK(&dma->work, rsnd_dma_do_work);

		return 0;

sound/soc/sh/rcar/rsnd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ struct rsnd_dma {
		struct sh_dmae_slave slave;
		struct work_struct work;
		struct dma_chan *chan;
		enum dma_data_direction dir;
		enum dma_transfer_direction dir;

		int submit_loop;
		int offset; /* it cares A/B plane */

Admin message