Skip to content

Commit

Permalink
powerpc/QE: use arch_initcall to probe QUICC Engine GPIOs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Vorontsov authored and Kumar Gala committed Jun 26, 2008
1 parent 2308c95 commit d14b3dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 4 additions & 1 deletion arch/powerpc/sysdev/qe_lib/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*/

#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/of.h>
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -143,4 +144,6 @@ void __init qe_add_gpiochips(void)
kfree(qe_gc);
/* try others anyway */
}
return 0;
}
arch_initcall(qe_add_gpiochips);
1 change: 0 additions & 1 deletion include/asm-powerpc/qe.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d14b3dd

Please sign in to comment.