| From ed18d899e65389a72e255b74e0ae67a5836d916c Mon Sep 17 00:00:00 2001 |
| From: Lars-Peter Clausen <lars@metafoo.de> |
| Date: Thu, 19 Jun 2014 09:40:30 +0200 |
| Subject: 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> |
| (cherry picked from commit cd7bcc6000165f6215d15e2e32b58a646e5de5ec) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 2 +- |
| sound/soc/sh/rcar/rsnd.h | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index ed76901f8202..7f68b33dcbbb 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -365,7 +365,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; |
| diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h |
| index 39d98af5ee05..067a89e9f25c 100644 |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -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 */ |
| -- |
| 2.1.2 |
| |