Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b85e04e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Dominik Brodowski
Browse files

pcmcia/sa1100: don't put machine specific init functions in .init.text 



These are called by sa11x0_drv_pcmcia_probe (which is marked now with
__devinit) so they can go to .devinit.text now, too.

This fixes:

	WARNING: drivers/pcmcia/sa1100_cs.o(.text+0x10): Section mismatch in reference from the function sa11x0_drv_pcmcia_probe() to the function .init.text:pcmcia_simpad_init()
	The function sa11x0_drv_pcmcia_probe() references
	the function __init pcmcia_simpad_init().
	This is often because sa11x0_drv_pcmcia_probe lacks a __init
	annotation or the annotation of pcmcia_simpad_init is wrong.

and a similar warning for pcmcia_collie_init, pcmcia_cerf_init,
pcmcia_h3600_init and pcmcia_shannon_init.

While at it mark pcmcia_assabet_init with __devinit, too.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
CC: Russell King <linux@arm.linux.org.uk>
CC: Eric Miao <eric.y.miao@gmail.com>
CC: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 20fffee8

drivers/pcmcia/pxa2xx_sharpsl.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { 
#ifdef CONFIG_SA1100_COLLIE

#include "sa11xx_base.h"



int __init pcmcia_collie_init(struct device *dev)

int __devinit pcmcia_collie_init(struct device *dev)

{

       int ret = -ENODEV;

drivers/pcmcia/sa1100_assabet.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = { 
	.socket_suspend		= assabet_pcmcia_socket_suspend,

};



int pcmcia_assabet_init(struct device *dev)

int __devinit pcmcia_assabet_init(struct device *dev)

{

	int ret = -ENODEV;

drivers/pcmcia/sa1100_cerf.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = { 
	.socket_suspend		= cerf_pcmcia_socket_suspend,

};



int __init pcmcia_cerf_init(struct device *dev)

int __devinit pcmcia_cerf_init(struct device *dev)

{

	int ret = -ENODEV;

drivers/pcmcia/sa1100_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = { 
#endif

};



static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)

static int __devinit sa11x0_drv_pcmcia_probe(struct platform_device *dev)

{

	int i, ret = -ENODEV;

drivers/pcmcia/sa1100_h3600.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = { 
	.socket_suspend		= h3600_pcmcia_socket_suspend,

};



int __init pcmcia_h3600_init(struct device *dev)

int __devinit pcmcia_h3600_init(struct device *dev)

{

	int ret = -ENODEV;