Patchwork [V2,10/10] ARM: mxs-dma: include <linux/dmaengine.h>

login
register
mail settings
Submitter Dong Aisheng
Date July 13, 2011, 3:40 a.m.
Message ID <1310528454-25178-1-git-send-email-b29396@freescale.com>
Download mbox | patch
Permalink /patch/104469/
State New
Headers show

Comments

Dong Aisheng - July 13, 2011, 3:40 a.m.
Other files using dma.h may fail to compile as follows:
In file included from sound/soc/mxs/mxs-pcm.h:22,
                 from sound/soc/mxs/mxs-saif.h:112,
                 from sound/soc/mxs/mxs-sgtl5000.c:34:
arch/arm/mach-mxs/include/mach/dma.h:16: warning: 'struct dma_chan' declared inside parameter list
arch/arm/mach-mxs/include/mach/dma.h:16: warning: its scope is only this definition or declaration, which is probably not what you want
arch/arm/mach-mxs/include/mach/dma.h: In function 'mxs_dma_is_apbh':
arch/arm/mach-mxs/include/mach/dma.h:18: error: dereferencing pointer to incomplete type
arch/arm/mach-mxs/include/mach/dma.h: At top level:
arch/arm/mach-mxs/include/mach/dma.h:21: warning: 'struct dma_chan' declared inside parameter list
arch/arm/mach-mxs/include/mach/dma.h: In function 'mxs_dma_is_apbx':
arch/arm/mach-mxs/include/mach/dma.h:23: error: dereferencing pointer to incomplete type
make[3]: *** [sound/soc/mxs/mxs-sgtl5000.o] Error 1
make[2]: *** [sound/soc/mxs] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2

It seems it's better for dma.h to include dmaengine.h himself.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-mxs/include/mach/dma.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Wolfram Sang - July 14, 2011, 2:17 p.m.
On Wed, Jul 13, 2011 at 11:40:54AM +0800, Dong Aisheng wrote:
> Other files using dma.h may fail to compile as follows:
> In file included from sound/soc/mxs/mxs-pcm.h:22,
>                  from sound/soc/mxs/mxs-saif.h:112,
>                  from sound/soc/mxs/mxs-sgtl5000.c:34:
> arch/arm/mach-mxs/include/mach/dma.h:16: warning: 'struct dma_chan' declared inside parameter list
> arch/arm/mach-mxs/include/mach/dma.h:16: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/arm/mach-mxs/include/mach/dma.h: In function 'mxs_dma_is_apbh':
> arch/arm/mach-mxs/include/mach/dma.h:18: error: dereferencing pointer to incomplete type
> arch/arm/mach-mxs/include/mach/dma.h: At top level:
> arch/arm/mach-mxs/include/mach/dma.h:21: warning: 'struct dma_chan' declared inside parameter list
> arch/arm/mach-mxs/include/mach/dma.h: In function 'mxs_dma_is_apbx':
> arch/arm/mach-mxs/include/mach/dma.h:23: error: dereferencing pointer to incomplete type
> make[3]: *** [sound/soc/mxs/mxs-sgtl5000.o] Error 1
> make[2]: *** [sound/soc/mxs] Error 2
> make[1]: *** [sound/soc] Error 2
> make: *** [sound] Error 2
> 
> It seems it's better for dma.h to include dmaengine.h himself.
> 
> Signed-off-by: Dong Aisheng <b29396@freescale.com>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

Sascha, maybe we can pick this one up already?

> ---
>  arch/arm/mach-mxs/include/mach/dma.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-mxs/include/mach/dma.h b/arch/arm/mach-mxs/include/mach/dma.h
> index 7f4aeea..203d7c4 100644
> --- a/arch/arm/mach-mxs/include/mach/dma.h
> +++ b/arch/arm/mach-mxs/include/mach/dma.h
> @@ -9,6 +9,8 @@
>  #ifndef __MACH_MXS_DMA_H__
>  #define __MACH_MXS_DMA_H__
>  
> +#include <linux/dmaengine.h>
> +
>  struct mxs_dma_data {
>  	int chan_irq;
>  };
> -- 
> 1.7.0.4
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Patch

diff --git a/arch/arm/mach-mxs/include/mach/dma.h b/arch/arm/mach-mxs/include/mach/dma.h
index 7f4aeea..203d7c4 100644
--- a/arch/arm/mach-mxs/include/mach/dma.h
+++ b/arch/arm/mach-mxs/include/mach/dma.h
@@ -9,6 +9,8 @@ 
 #ifndef __MACH_MXS_DMA_H__
 #define __MACH_MXS_DMA_H__
 
+#include <linux/dmaengine.h>
+
 struct mxs_dma_data {
 	int chan_irq;
 };