powerpc/QE: use arch_initcall to probe QUICC Engine GPIOs

Anton Vorontsov · kumargala · commit d14b3dd6190a · 2008-06-26T01:49:09.000-05:00
It was discussed that global arch_initcall() is preferred way to probe
QE GPIOs, so let's use it.

Signed-off-by: Anton Vorontsov &lt;avorontsov@ru.mvista.com&gt;
Signed-off-by: Kumar Gala &lt;galak@kernel.crashing.org&gt;
diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/of.h>
@@ -102,7 +103,7 @@ static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 	return 0;
 }
 
-void __init qe_add_gpiochips(void)
+static int __init qe_add_gpiochips(void)
 {
 	struct device_node *np;
 
@@ -143,4 +144,6 @@ void __init qe_add_gpiochips(void)
 		kfree(qe_gc);
 		/* try others anyway */
 	}
+	return 0;
 }
+arch_initcall(qe_add_gpiochips);
diff --git a/include/asm-powerpc/qe.h b/include/asm-powerpc/qe.h
@@ -101,7 +101,6 @@ struct qe_pio_regs {
 #endif
 };
 
-extern void __init qe_add_gpiochips(void);
 extern int par_io_init(struct device_node *np);
 extern int par_io_of_config(struct device_node *np);
 #define QE_PIO_DIR_IN	2

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`*/`
`13`	`13`
`14`	`14`	`#include <linux/kernel.h>`
	`15`	`+#include <linux/init.h>`
`15`	`16`	`#include <linux/spinlock.h>`
`16`	`17`	`#include <linux/io.h>`
`17`	`18`	`#include <linux/of.h>`
`@@ -102,7 +103,7 @@ static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)`
`102`	`103`	`return 0;`
`103`	`104`	`}`
`104`	`105`
`105`		`-void __init qe_add_gpiochips(void)`
	`106`	`+static int __init qe_add_gpiochips(void)`
`106`	`107`	`{`
`107`	`108`	`struct device_node *np;`
`108`	`109`
`@@ -143,4 +144,6 @@ void __init qe_add_gpiochips(void)`
`143`	`144`	`kfree(qe_gc);`
`144`	`145`	`/* try others anyway */`
`145`	`146`	`}`
	`147`	`+ return 0;`
`146`	`148`	`}`
	`149`	`+arch_initcall(qe_add_gpiochips);`