Subject: [PATCH] powerpc/QE: use arch_initcall to probe QUICC Engine GPIOs

From: Anton Vorontsov <[email-masked]>
Date: Thu, 12 Jun 2008 03:42:14 +0400

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

Signed-off-by: Anton Vorontsov <[email-masked]>
---

On Wed, Jun 11, 2008 at 08:52:16AM -0500, Kumar Gala wrote:
[...]
>>> applied.
>>
>> I've just rebased on the pushed out powerpc-next branch, and noticed
>> that you merged this patch from the old series.
>>
>> The difference is in absence of arch_initcall() for QE GPIOs
>> initialization, i.e. in this version boards should explicitly call
>> qe_add_gpiochips(). So.. was this done deliberately? Or should I send
>> you an update?
>
> just send me an update to my tree at this point.

Here it is.

Thanks,

 arch/powerpc/sysdev/qe_lib/gpio.c |    5 ++++-
 include/asm-powerpc/qe.h          |    1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c
index c712e24..8e5a0bc 100644
--- 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 1355e72..edee15d 100644
--- 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
-- 
1.5.5.4