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