diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2008-10-16 07:02:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 20:21:38 +0200 |
| commit | 673c0c00382ed807f09d94e806f3519ddeeb4f70 (patch) | |
| tree | 005bccdee7f27660fd2c738fbe26635f019aae96 | |
| parent | orion_spi: handle 88F6183 erratum (diff) | |
| download | linux-673c0c00382ed807f09d94e806f3519ddeeb4f70.tar.xz linux-673c0c00382ed807f09d94e806f3519ddeeb4f70.zip | |
spi: core and gpio expanders use subsys_init
Make the SPI external GPIO expander drivers register themselves at
subsys_initcall() time when they're statically linked, and make the SPI
core do its driver model initialization earlier so that's safe.
SOC-integrated GPIOs are available starting very early -- often before
initcalls start to run, or earily in arch_initcall() at latest -- so this
improves consistency, letting more subsystems rely on GPIOs being usable
by their own subsys_initcall() code.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/gpio/max7301.c | 6 | ||||
| -rw-r--r-- | drivers/gpio/mcp23s08.c | 5 | ||||
| -rw-r--r-- | drivers/spi/spi.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c index 39c795ad8312..1b5ad97b9e5b 100644 --- a/drivers/gpio/max7301.c +++ b/drivers/gpio/max7301.c @@ -325,13 +325,15 @@ static int __init max7301_init(void) { return spi_register_driver(&max7301_driver); } +/* register after spi postcore initcall and before + * subsys initcalls that may rely on these GPIOs + */ +subsys_initcall(max7301_init); static void __exit max7301_exit(void) { spi_unregister_driver(&max7301_driver); } - -module_init(max7301_init); module_exit(max7301_exit); MODULE_AUTHOR("Juergen Beisert"); diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c index 8a1b405fefda..89c1d222e9d1 100644 --- a/drivers/gpio/mcp23s08.c +++ b/drivers/gpio/mcp23s08.c @@ -419,7 +419,10 @@ static int __init mcp23s08_init(void) { return spi_register_driver(&mcp23s08_driver); } -module_init(mcp23s08_init); +/* register after spi postcore initcall and before + * subsys initcalls that may rely on these GPIOs + */ +subsys_initcall(mcp23s08_init); static void __exit mcp23s08_exit(void) { diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 2de6b0e72f3f..3734dc9708e1 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -738,5 +738,5 @@ err0: * driver registration) _could_ be dynamically linked (modular) ... costs * include needing to have boardinfo data structures be much more public. */ -subsys_initcall(spi_init); +postcore_initcall(spi_init); |