[PATCH] ARM: DMA: Add missing semicolon for the define of dma_alloc_area

[PATCH] ARM: DMA: Add missing semicolon for the define of dma_alloc_area

[Axel Lin]

I got below build error by: make at91x40_defconfig;make
Fix it by adding a missing semicolon for the define of dma_alloc_area.

  CC      arch/arm/mm/dma-mapping.o
arch/arm/mm/dma-mapping.c:309: warning: 'struct dma_coherent_area' declared inside parameter list
arch/arm/mm/dma-mapping.c:309: warning: its scope is only this definition or declaration, which is probably not what you want
arch/arm/mm/dma-mapping.c: In function '__dma_alloc':
arch/arm/mm/dma-mapping.c:324: error: expected ';' before '}' token
arch/arm/mm/dma-mapping.c: At top level:
arch/arm/mm/dma-mapping.c:334: warning: 'struct dma_coherent_area' declared inside parameter list
arch/arm/mm/dma-mapping.c:374: warning: 'struct dma_coherent_area' declared inside parameter list
make[1]: *** [arch/arm/mm/dma-mapping.o] Error 1
make: *** [arch/arm/mm] Error 2

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 arch/arm/mm/dma-mapping.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 3ec2129..090690d 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -291,7 +291,7 @@ static void dma_free_area(void *cpu_addr, size_t size, struct dma_coherent_area
 
 #else	/* !CONFIG_MMU */
 
-#define dma_alloc_area(size, pfn, gfp, area)	({ *(pfn) = 0; NULL })
+#define dma_alloc_area(size, pfn, gfp, area)	({ *(pfn) = 0; NULL; })
 #define dma_free_area(addr, size, area)		do { } while (0)
 
 #define nommu()	(1)
-- 
1.7.4.1

Re: [PATCH] ARM: DMA: Add missing semicolon for the define of dma_alloc_area

[Sergei Shtylyov]

Hello.

On 01-07-2011 12:37, Axel Lin wrote:

> I got below build error by: make at91x40_defconfig;make
> Fix it by adding a missing semicolon for the define of dma_alloc_area.

>    CC      arch/arm/mm/dma-mapping.o
> arch/arm/mm/dma-mapping.c:309: warning: 'struct dma_coherent_area' declared inside parameter list
> arch/arm/mm/dma-mapping.c:309: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/arm/mm/dma-mapping.c: In function '__dma_alloc':
> arch/arm/mm/dma-mapping.c:324: error: expected ';' before '}' token
> arch/arm/mm/dma-mapping.c: At top level:
> arch/arm/mm/dma-mapping.c:334: warning: 'struct dma_coherent_area' declared inside parameter list
> arch/arm/mm/dma-mapping.c:374: warning: 'struct dma_coherent_area' declared inside parameter list
> make[1]: *** [arch/arm/mm/dma-mapping.o] Error 1
> make: *** [arch/arm/mm] Error 2

    You didn't fix the warning though, so not clear why you cited them....

> Signed-off-by: Axel Lin<axel.lin@gmail.com>

WBR, Sergei

Re: [PATCH] ARM: DMA: Add missing semicolon for the define of dma_alloc_area

[Axel Lin]

2011/7/1 Sergei Shtylyov <sshtylyov@mvista.com>:
> Hello.
>
> On 01-07-2011 12:37, Axel Lin wrote:
>
>> I got below build error by: make at91x40_defconfig;make
>> Fix it by adding a missing semicolon for the define of dma_alloc_area.
>
>>   CC      arch/arm/mm/dma-mapping.o
>> arch/arm/mm/dma-mapping.c:309: warning: 'struct dma_coherent_area'
>> declared inside parameter list
>> arch/arm/mm/dma-mapping.c:309: warning: its scope is only this definition
>> or declaration, which is probably not what you want
>> arch/arm/mm/dma-mapping.c: In function '__dma_alloc':
>> arch/arm/mm/dma-mapping.c:324: error: expected ';' before '}' token
>> arch/arm/mm/dma-mapping.c: At top level:
>> arch/arm/mm/dma-mapping.c:334: warning: 'struct dma_coherent_area'
>> declared inside parameter list
>> arch/arm/mm/dma-mapping.c:374: warning: 'struct dma_coherent_area'
>> declared inside parameter list
>> make[1]: *** [arch/arm/mm/dma-mapping.o] Error 1
>> make: *** [arch/arm/mm] Error 2
>
>   You didn't fix the warning though, so not clear why you cited them....
Because it's a copy-paste from the output of make.
I just think I should not manually edit the log.

Well, a patch to fix the warning is on the way.

Regards,
Axel