aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-17 16:23:29 -0800
committerGrant Likely <grant.likely@secretlab.ca>2012-03-09 14:41:49 -0700
commit690fb11be34cc908ef895d16c6c1673df1b4667a (patch)
tree6cad6252fae54f90fa4abb4c791d403f39f2b51e /drivers/spi
parentspi/s3c64xx: Convert to using core message queue (diff)
downloadlinux-dev-690fb11be34cc908ef895d16c6c1673df1b4667a.tar.xz
linux-dev-690fb11be34cc908ef895d16c6c1673df1b4667a.zip
spi: Mark spi_register_board_info() __devinit
Some systems have SPI devices located on plugin modules which are enumerated at runtime as devices. The drivers for these plugin modules need to register their SPI devices at probe() time so want to be able to call spi_register_board_info() but that function is currently marked as __init rather than __devinit so this usage isn't legal. Change the annotation to __devinit to handle this. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index c12a9dba2d82..7ea06af8636a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -484,7 +484,7 @@ static void spi_match_master_to_boardinfo(struct spi_master *master,
* The board info passed can safely be __initdata ... but be careful of
* any embedded pointers (platform_data, etc), they're copied as-is.
*/
-int __init
+int __devinit
spi_register_board_info(struct spi_board_info const *info, unsigned n)
{
struct boardinfo *bi;