Commit 5b85e04e93f9a2963e88156cae8629ee72efd890

Authored by Uwe Kleine-König
Committed by Dominik Brodowski
1 parent 20fffee818

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: 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>

Showing 7 changed files with 7 additions and 7 deletions Side-by-side Diff

drivers/pcmcia/pxa2xx_sharpsl.c
... ... @@ -237,7 +237,7 @@
237 237 #ifdef CONFIG_SA1100_COLLIE
238 238 #include "sa11xx_base.h"
239 239  
240   -int __init pcmcia_collie_init(struct device *dev)
  240 +int __devinit pcmcia_collie_init(struct device *dev)
241 241 {
242 242 int ret = -ENODEV;
243 243  
drivers/pcmcia/sa1100_assabet.c
... ... @@ -130,7 +130,7 @@
130 130 .socket_suspend = assabet_pcmcia_socket_suspend,
131 131 };
132 132  
133   -int pcmcia_assabet_init(struct device *dev)
  133 +int __devinit pcmcia_assabet_init(struct device *dev)
134 134 {
135 135 int ret = -ENODEV;
136 136  
drivers/pcmcia/sa1100_cerf.c
... ... @@ -97,7 +97,7 @@
97 97 .socket_suspend = cerf_pcmcia_socket_suspend,
98 98 };
99 99  
100   -int __init pcmcia_cerf_init(struct device *dev)
  100 +int __devinit pcmcia_cerf_init(struct device *dev)
101 101 {
102 102 int ret = -ENODEV;
103 103  
drivers/pcmcia/sa1100_generic.c
... ... @@ -64,7 +64,7 @@
64 64 #endif
65 65 };
66 66  
67   -static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)
  67 +static int __devinit sa11x0_drv_pcmcia_probe(struct platform_device *dev)
68 68 {
69 69 int i, ret = -ENODEV;
70 70  
drivers/pcmcia/sa1100_h3600.c
... ... @@ -219,7 +219,7 @@
219 219 .socket_suspend = h3600_pcmcia_socket_suspend,
220 220 };
221 221  
222   -int __init pcmcia_h3600_init(struct device *dev)
  222 +int __devinit pcmcia_h3600_init(struct device *dev)
223 223 {
224 224 int ret = -ENODEV;
225 225  
drivers/pcmcia/sa1100_shannon.c
... ... @@ -113,7 +113,7 @@
113 113 .socket_suspend = shannon_pcmcia_socket_suspend,
114 114 };
115 115  
116   -int __init pcmcia_shannon_init(struct device *dev)
  116 +int __devinit pcmcia_shannon_init(struct device *dev)
117 117 {
118 118 int ret = -ENODEV;
119 119  
drivers/pcmcia/sa1100_simpad.c
... ... @@ -123,7 +123,7 @@
123 123 .socket_suspend = simpad_pcmcia_socket_suspend,
124 124 };
125 125  
126   -int __init pcmcia_simpad_init(struct device *dev)
  126 +int __devinit pcmcia_simpad_init(struct device *dev)
127 127 {
128 128 int ret = -ENODEV;
129 129