aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pxa2xx_base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/pxa2xx_base.c')
-rw-r--r--drivers/pcmcia/pxa2xx_base.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 84dde7768ad5..bae8e6e2d48c 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -252,6 +252,7 @@ int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)
252 252
253 return soc_pcmcia_add_one(skt); 253 return soc_pcmcia_add_one(skt);
254} 254}
255EXPORT_SYMBOL(pxa2xx_drv_pcmcia_add_one);
255 256
256void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops) 257void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops)
257{ 258{
@@ -261,19 +262,19 @@ void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops)
261 ops->frequency_change = pxa2xx_pcmcia_frequency_change; 262 ops->frequency_change = pxa2xx_pcmcia_frequency_change;
262#endif 263#endif
263} 264}
265EXPORT_SYMBOL(pxa2xx_drv_pcmcia_ops);
264 266
265int __pxa2xx_drv_pcmcia_probe(struct device *dev) 267static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
266{ 268{
267 int i, ret = 0; 269 int i, ret = 0;
268 struct pcmcia_low_level *ops; 270 struct pcmcia_low_level *ops;
269 struct skt_dev_info *sinfo; 271 struct skt_dev_info *sinfo;
270 struct soc_pcmcia_socket *skt; 272 struct soc_pcmcia_socket *skt;
271 273
272 if (!dev || !dev->platform_data) 274 ops = (struct pcmcia_low_level *)dev->dev.platform_data;
275 if (!ops)
273 return -ENODEV; 276 return -ENODEV;
274 277
275 ops = (struct pcmcia_low_level *)dev->platform_data;
276
277 pxa2xx_drv_pcmcia_ops(ops); 278 pxa2xx_drv_pcmcia_ops(ops);
278 279
279 sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL); 280 sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL);
@@ -308,13 +309,6 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
308 309
309 return ret; 310 return ret;
310} 311}
311EXPORT_SYMBOL(__pxa2xx_drv_pcmcia_probe);
312
313
314static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
315{
316 return __pxa2xx_drv_pcmcia_probe(&dev->dev);
317}
318 312
319static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev) 313static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
320{ 314{