forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: rcar: Fix dma direction type

Browse source 
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>
This commit is contained in:
Lars-Peter Clausen 2014-06-19 09:40:30 +02:00 • committed by Mark Brown
commit cd7bcc6000
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/sh/rcar/core.c
View file

@ -363,7 +363,7 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
if (ret < 0) if (ret < 0)
goto rsnd_dma_init_err; 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); INIT_WORK(&dma->work, rsnd_dma_do_work);
return 0; return 0;

2
sound/soc/sh/rcar/rsnd.h
View file

@ -158,7 +158,7 @@ struct rsnd_dma {
struct sh_dmae_slave slave; struct sh_dmae_slave slave;
struct work_struct work; struct work_struct work;
struct dma_chan *chan; struct dma_chan *chan;
enum dma_data_direction dir; enum dma_transfer_direction dir;
int submit_loop; int submit_loop;
int offset; /* it cares A/B plane */ int offset; /* it cares A/B plane */