|
@@ -252,6 +252,7 @@ int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt)
|
|
|
|
|
|
return soc_pcmcia_add_one(skt);
|
|
|
}
|
|
|
+EXPORT_SYMBOL(pxa2xx_drv_pcmcia_add_one);
|
|
|
|
|
|
void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops)
|
|
|
{
|
|
@@ -261,19 +262,19 @@ void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops)
|
|
|
ops->frequency_change = pxa2xx_pcmcia_frequency_change;
|
|
|
#endif
|
|
|
}
|
|
|
+EXPORT_SYMBOL(pxa2xx_drv_pcmcia_ops);
|
|
|
|
|
|
-int __pxa2xx_drv_pcmcia_probe(struct device *dev)
|
|
|
+static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
|
|
|
{
|
|
|
int i, ret = 0;
|
|
|
struct pcmcia_low_level *ops;
|
|
|
struct skt_dev_info *sinfo;
|
|
|
struct soc_pcmcia_socket *skt;
|
|
|
|
|
|
- if (!dev || !dev->platform_data)
|
|
|
+ ops = (struct pcmcia_low_level *)dev->dev.platform_data;
|
|
|
+ if (!ops)
|
|
|
return -ENODEV;
|
|
|
|
|
|
- ops = (struct pcmcia_low_level *)dev->platform_data;
|
|
|
-
|
|
|
pxa2xx_drv_pcmcia_ops(ops);
|
|
|
|
|
|
sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL);
|
|
@@ -308,13 +309,6 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
|
-EXPORT_SYMBOL(__pxa2xx_drv_pcmcia_probe);
|
|
|
-
|
|
|
-
|
|
|
-static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
|
|
|
-{
|
|
|
- return __pxa2xx_drv_pcmcia_probe(&dev->dev);
|
|
|
-}
|
|
|
|
|
|
static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
|
|
|
{
|