DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Uwe 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: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Uwe Kleine-König
2010-11-04 10:46:14 +01:00
committed by Dominik Brodowski
parent 20fffee818
commit 5b85e04e93
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pcmcia/pxa2xx_sharpsl.c
View File

@@ -237,7 +237,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
#ifdef CONFIG_SA1100_COLLIE #ifdef CONFIG_SA1100_COLLIE
#include "sa11xx_base.h" #include "sa11xx_base.h"
int __init pcmcia_collie_init(struct device *dev) int __devinit pcmcia_collie_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_assabet.c
View File

@@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = {
.socket_suspend = assabet_pcmcia_socket_suspend, .socket_suspend = assabet_pcmcia_socket_suspend,
}; };
int pcmcia_assabet_init(struct device *dev) int __devinit pcmcia_assabet_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_cerf.c
View File

@@ -97,7 +97,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = {
.socket_suspend = cerf_pcmcia_socket_suspend, .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; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_generic.c
View File

@@ -64,7 +64,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#endif #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; int i, ret = -ENODEV;

2
drivers/pcmcia/sa1100_h3600.c
View File

@@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = {
.socket_suspend = h3600_pcmcia_socket_suspend, .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; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_shannon.c
View File

@@ -113,7 +113,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = {
.socket_suspend = shannon_pcmcia_socket_suspend, .socket_suspend = shannon_pcmcia_socket_suspend,
}; };
int __init pcmcia_shannon_init(struct device *dev) int __devinit pcmcia_shannon_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_simpad.c
View File

@@ -123,7 +123,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = {
.socket_suspend = simpad_pcmcia_socket_suspend, .socket_suspend = simpad_pcmcia_socket_suspend,
}; };
int __init pcmcia_simpad_init(struct device *dev) int __devinit pcmcia_simpad_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;