Skip to contentSkip to conversation

spi/omap2: mark omap2_mcspi_master_setup as __devinit

PATCH Arnd Bergmann 2 participants 2 messages Jul 19, 2012 SPI

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

This warning recently appeared with omap2plus_defconfig:

WARNING: drivers/spi/built-in.o(.devinit.text+0x3c4): Section mismatch in reference from the function omap2_mcspi_probe() to the function .init.text:omap2_mcspi_master_setup() The function __devinit omap2_mcspi_probe() references
a function __init omap2_mcspi_master_setup().
If omap2_mcspi_master_setup is only used by omap2_mcspi_probe then
annotate omap2_mcspi_master_setup with a matching annotation.

The fix is obviously to mark the omap2_mcspi_master_setup function as __devinit, rather than __init.

Signed-off-by Arnd Bergmann <[email protected]>
drivers/spi/spi-omap2-mcspi.c +1 -1
index 0c73dd4..dc02f2f 100644
@@ -1032,7 +1032,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
 	return 0;
 }
 
-static int __init omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
+static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
 {
 	struct spi_master	*master = mcspi->master;
 	struct omap2_mcspi_regs	*ctx = &mcspi->ctx;

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

Acked-by Shubhrajyoti D
#1 lore raw

+Mark
Since Grant is moving to a new house.

Quoted 10 lines · Arnd Bergmann

This warning recently appeared with omap2plus_defconfig:

WARNING: drivers/spi/built-in.o(.devinit.text+0x3c4): Section mismatch in reference from the function omap2_mcspi_probe() to the function .init.text:omap2_mcspi_master_setup() The function __devinit omap2_mcspi_probe() references
a function __init omap2_mcspi_master_setup().
If omap2_mcspi_master_setup is only used by omap2_mcspi_probe then
annotate omap2_mcspi_master_setup with a matching annotation.

The fix is obviously to mark the omap2_mcspi_master_setup function as __devinit, rather than __init.

Acked-by Shubhrajyoti D <[email protected] <mailto:[email protected]>>

Thanks for the patch.
Apologies for breaking in one my patch series.

Quoted 8 lines
Signed-off-by Arnd Bergmann <[email protected]>
drivers/spi/spi-omap2-mcspi.c +0 -0
index 0c73dd4..dc02f2f 100644

drivers/spi/spi-omap2-mcspi.c static int omap2_mcspi_transfer_one_message(struct spi_master *master, · line 1038

Quoted 8 lines
drivers/spi/spi-omap2-mcspi.c +1 -1
@@ -1032,7 +1032,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
 	return 0;
 }
 
-static int __init omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
+static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
 {
 	struct spi_master	*master = mcspi->master;
 	struct omap2_mcspi_regs	*ctx = &mcspi->ctx;

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/