浏览代码

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>
Anton Vorontsov 17 年之前
父节点
当前提交
d14b3dd619
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 4 1
      arch/powerpc/sysdev/qe_lib/gpio.c
  2. 0 1
      include/asm-powerpc/qe.h

+ 4 - 1
arch/powerpc/sysdev/qe_lib/gpio.c

@@ -12,6 +12,7 @@
  */
  */
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/io.h>
 #include <linux/of.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;
 	return 0;
 }
 }
 
 
-void __init qe_add_gpiochips(void)
+static int __init qe_add_gpiochips(void)
 {
 {
 	struct device_node *np;
 	struct device_node *np;
 
 
@@ -143,4 +144,6 @@ err:
 		kfree(qe_gc);
 		kfree(qe_gc);
 		/* try others anyway */
 		/* try others anyway */
 	}
 	}
+	return 0;
 }
 }
+arch_initcall(qe_add_gpiochips);

+ 0 - 1
include/asm-powerpc/qe.h

@@ -101,7 +101,6 @@ struct qe_pio_regs {
 #endif
 #endif
 };
 };
 
 
-extern void __init qe_add_gpiochips(void);
 extern int par_io_init(struct device_node *np);
 extern int par_io_init(struct device_node *np);
 extern int par_io_of_config(struct device_node *np);
 extern int par_io_of_config(struct device_node *np);
 #define QE_PIO_DIR_IN	2
 #define QE_PIO_DIR_IN	2