powerpc/QE: use arch_initcall to probe QUICC Engine GPIOs

It was discussed that global arch_initcall() is preferred way to probe
QE GPIOs, so let's use it.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c
index c712e245dc4c87ca0177ec3892b8aaf4d3542704..8e5a0bc36d0be40c1da806b91cb3a721348e84d6 100644 (file)
--- 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 @@ err:
                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
index 1355e726701359cbd09f6d08230890f6d4232d16..edee15d269eaaf285d64e1e650609310edd4c11e 100644 (file)
--- 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