drivers / dma-contiguous: Fix __init attribute location

hanjun-guo · gregkh · commit cebcac7c59e8 · 2013-08-19T17:10:10.000-07:00
__init belongs after the return type on functions, not before it.

Signed-off-by: Hanjun Guo &lt;hanjun.guo@linaro.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
@@ -134,7 +134,7 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
 
 static DEFINE_MUTEX(cma_mutex);
 
-static __init int cma_activate_area(unsigned long base_pfn, unsigned long count)
+static int __init cma_activate_area(unsigned long base_pfn, unsigned long count)
 {
 	unsigned long pfn = base_pfn;
 	unsigned i = count >> pageblock_order;
@@ -156,7 +156,7 @@ static __init int cma_activate_area(unsigned long base_pfn, unsigned long count)
 	return 0;
 }
 
-static __init struct cma *cma_create_area(unsigned long base_pfn,
+static struct cma * __init cma_create_area(unsigned long base_pfn,
 				     unsigned long count)
 {
 	int bitmap_size = BITS_TO_LONGS(count) * sizeof(long);

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void __init dma_contiguous_reserve(phys_addr_t limit)`
`134`	`134`
`135`	`135`	`static DEFINE_MUTEX(cma_mutex);`
`136`	`136`
`137`		`-static __init int cma_activate_area(unsigned long base_pfn, unsigned long count)`
	`137`	`+static int __init cma_activate_area(unsigned long base_pfn, unsigned long count)`
`138`	`138`	`{`
`139`	`139`	`unsigned long pfn = base_pfn;`
`140`	`140`	`unsigned i = count >> pageblock_order;`
`@@ -156,7 +156,7 @@ static __init int cma_activate_area(unsigned long base_pfn, unsigned long count)`
`156`	`156`	`return 0;`
`157`	`157`	`}`
`158`	`158`
`159`		`-static __init struct cma *cma_create_area(unsigned long base_pfn,`
	`159`	`+static struct cma * __init cma_create_area(unsigned long base_pfn,`
`160`	`160`	`unsigned long count)`
`161`	`161`	`{`
`162`	`162`	`int bitmap_size = BITS_TO_LONGS(count) * sizeof(long);`