Skip to content

Commit

Permalink
spi: core and gpio expanders use subsys_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Brownell authored and torvalds committed Oct 16, 2008
1 parent 2bec19f commit 673c0c0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions drivers/gpio/max7301.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
5 changes: 4 additions & 1 deletion drivers/gpio/mcp23s08.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -738,5 +738,5 @@ static int __init spi_init(void)
* 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);

0 comments on commit 673c0c0

Please sign in to comment.