pcmcia: fix platform driver hotplug/coldplug

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 7fa18fb814bc7b862478e38c4d3b3a42f3e79b40..9414163c78e7ec2582a7c58848a02387e893c0a2 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -18,7 +18,6 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/cpufreq.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
@@ -30,6 +29,7 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
@@ -59,7 +59,7 @@ static inline u_int pxa2xx_mcxx_asst(u_int pcmcia_cycle_ns,
                                     u_int mem_clk_10khz)
 {
        u_int code = pcmcia_cycle_ns * mem_clk_10khz;
-       return (code / 300000) + ((code % 300000) ? 1 : 0) - 1;
+       return (code / 300000) + ((code % 300000) ? 1 : 0) + 1;
 }
 
 static inline u_int pxa2xx_mcxx_setup(u_int pcmcia_cycle_ns,
@@ -167,7 +167,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
 }
 #endif
 
-int pxa2xx_drv_pcmcia_probe(struct device *dev)
+int __pxa2xx_drv_pcmcia_probe(struct device *dev)
 {
        int ret;
        struct pcmcia_low_level *ops;
@@ -204,35 +204,53 @@ int pxa2xx_drv_pcmcia_probe(struct device *dev)
 
        return ret;
 }
-EXPORT_SYMBOL(pxa2xx_drv_pcmcia_probe);
+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)
+{
+       return soc_common_drv_pcmcia_remove(&dev->dev);
+}
+
+static int pxa2xx_drv_pcmcia_suspend(struct platform_device *dev, pm_message_t state)
+{
+       return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
 
-static int pxa2xx_drv_pcmcia_resume(struct device *dev)
+static int pxa2xx_drv_pcmcia_resume(struct platform_device *dev)
 {
-       struct pcmcia_low_level *ops = dev->platform_data;
+       struct pcmcia_low_level *ops = dev->dev.platform_data;
        int nr = ops ? ops->nr : 0;
 
        MECR = nr > 1 ? MECR_CIT | MECR_NOS : (nr > 0 ? MECR_CIT : 0);
 
-       return pcmcia_socket_dev_resume(dev);
+       return pcmcia_socket_dev_resume(&dev->dev);
 }
 
-static struct device_driver pxa2xx_pcmcia_driver = {
+static struct platform_driver pxa2xx_pcmcia_driver = {
        .probe          = pxa2xx_drv_pcmcia_probe,
-       .remove         = soc_common_drv_pcmcia_remove,
-       .suspend        = pcmcia_socket_dev_suspend,
+       .remove         = pxa2xx_drv_pcmcia_remove,
+       .suspend        = pxa2xx_drv_pcmcia_suspend,
        .resume         = pxa2xx_drv_pcmcia_resume,
-       .name           = "pxa2xx-pcmcia",
-       .bus            = &platform_bus_type,
+       .driver         = {
+               .name   = "pxa2xx-pcmcia",
+               .owner  = THIS_MODULE,
+       },
 };
 
 static int __init pxa2xx_pcmcia_init(void)
 {
-       return driver_register(&pxa2xx_pcmcia_driver);
+       return platform_driver_register(&pxa2xx_pcmcia_driver);
 }
 
 static void __exit pxa2xx_pcmcia_exit(void)
 {
-       driver_unregister(&pxa2xx_pcmcia_driver);
+       platform_driver_unregister(&pxa2xx_pcmcia_driver);
 }
 
 fs_initcall(pxa2xx_pcmcia_init);
@@ -241,3 +259,4 @@ module_exit(pxa2xx_pcmcia_exit);
 MODULE_AUTHOR("Stefan Eletzhofer <stefan.eletzhofer@inquant.de> and Ian Molton <spyro@f2s.com>");
 MODULE_DESCRIPTION("Linux PCMCIA Card Services: PXA2xx core socket driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-pcmcia");