7 files changed, 159 insertions, 68 deletions

diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c
index fc1de46fd20a..90013341cd5f 100644
--- a/drivers/pcmcia/au1000_generic.c
+++ b/drivers/pcmcia/au1000_generic.c
@@ -468,13 +468,13 @@ out:
         return ret;
 }
 
-int au1x00_drv_pcmcia_remove(struct device *dev)
+int au1x00_drv_pcmcia_remove(struct platform_device *dev)
 {
-        struct skt_dev_info *sinfo = dev_get_drvdata(dev);
+        struct skt_dev_info *sinfo = platform_get_drvdata(dev);
         int i;
 
         mutex_lock(&pcmcia_sockets_lock);
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         for (i = 0; i < sinfo->nskt; i++) {
                 struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
@@ -498,13 +498,13 @@ int au1x00_drv_pcmcia_remove(struct device *dev)
  * PCMCIA "Driver" API
  */
 
-static int au1x00_drv_pcmcia_probe(struct device *dev)
+static int au1x00_drv_pcmcia_probe(struct platform_device *dev)
 {
         int i, ret = -ENODEV;
 
         mutex_lock(&pcmcia_sockets_lock);
         for (i=0; i < ARRAY_SIZE(au1x00_pcmcia_hw_init); i++) {
-                ret = au1x00_pcmcia_hw_init[i](dev);
+                ret = au1x00_pcmcia_hw_init[i](&dev->dev);
                 if (ret == 0)
                         break;
         }
@@ -512,14 +512,26 @@ static int au1x00_drv_pcmcia_probe(struct device *dev)
         return ret;
 }
 
+static int au1x00_drv_pcmcia_suspend(struct platform_device *dev,
+                                     pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int au1x00_drv_pcmcia_resume(struct platform_device *dev)
+{
+        return pcmcia_socket_dev_resume(&dev->dev);
+}
 
-static struct device_driver au1x00_pcmcia_driver = {
+static struct platform_driver au1x00_pcmcia_driver = {
+        .driver = {
+                .name           = "au1x00-pcmcia",
+                .owner          = THIS_MODULE,
+        },
         .probe          = au1x00_drv_pcmcia_probe,
         .remove         = au1x00_drv_pcmcia_remove,
-        .name           = "au1x00-pcmcia",
-        .bus            = &platform_bus_type,
-        .suspend        = pcmcia_socket_dev_suspend,
-        .resume         = pcmcia_socket_dev_resume,
+        .suspend        = au1x00_drv_pcmcia_suspend,
+        .resume         = au1x00_drv_pcmcia_resume,
 };
 
 
@@ -533,8 +545,7 @@ static struct device_driver au1x00_pcmcia_driver = {
 static int __init au1x00_pcmcia_init(void)
 {
         int error = 0;
-        if ((error = driver_register(&au1x00_pcmcia_driver)))
-                return error;
+        error = platform_driver_register(&au1x00_pcmcia_driver);
         return error;
 }
 
@@ -544,7 +555,7 @@ static int __init au1x00_pcmcia_init(void)
  */
 static void __exit au1x00_pcmcia_exit(void)
 {
-        driver_unregister(&au1x00_pcmcia_driver);
+        platform_driver_unregister(&au1x00_pcmcia_driver);
 }
 
 module_init(au1x00_pcmcia_init);
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index 71653ab84890..40d4953e4b12 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -1238,6 +1238,16 @@ static int pcic_init(struct pcmcia_socket *s)
         return 0;
 }
 
+static int i82365_drv_pcmcia_suspend(struct platform_device *dev,
+                                     pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int i82365_drv_pcmcia_resume(struct platform_device *dev)
+{
+        return pcmcia_socket_dev_resume(&dev->dev);
+}
 static struct pccard_operations pcic_operations = {
         .init                   = pcic_init,
         .get_status             = pcic_get_status,
@@ -1248,11 +1258,13 @@ static struct pccard_operations pcic_operations = {
 
 /*====================================================================*/
 
-static struct device_driver i82365_driver = {
-        .name = "i82365",
-        .bus = &platform_bus_type,
-        .suspend = pcmcia_socket_dev_suspend,
-        .resume = pcmcia_socket_dev_resume,
+static struct platform_driver i82365_driver = {
+        .driver = {
+                .name = "i82365",
+                .owner          = THIS_MODULE,
+        },
+        .suspend        = i82365_drv_pcmcia_suspend,
+        .resume         = i82365_drv_pcmcia_resume,
 };
 
 static struct platform_device *i82365_device;
@@ -1261,7 +1273,7 @@ static int __init init_i82365(void)
 {
     int i, ret;
 
-    ret = driver_register(&i82365_driver);
+    ret = platform_driver_register(&i82365_driver);
     if (ret)
         goto err_out;
 
@@ -1337,7 +1349,7 @@ err_dev_unregister:
         pnp_disable_dev(i82365_pnpdev);
 #endif
 err_driver_unregister:
-    driver_unregister(&i82365_driver);
+    platform_driver_unregister(&i82365_driver);
 err_out:
     return ret;
 } /* init_i82365 */
@@ -1365,7 +1377,7 @@ static void __exit exit_i82365(void)
     if (i82365_pnpdev)
                 pnp_disable_dev(i82365_pnpdev);
 #endif
-    driver_unregister(&i82365_driver);
+    platform_driver_unregister(&i82365_driver);
 } /* exit_i82365 */
 
 module_init(init_i82365);
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index 2ab4f22c21de..62b4ecc97c46 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -696,13 +696,25 @@ static struct pccard_operations pcc_operations = {
         .set_mem_map            = pcc_set_mem_map,
 };
 
+static int cfc_drv_pcmcia_suspend(struct platform_device *dev,
+                                     pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int cfc_drv_pcmcia_resume(struct platform_device *dev)
+{
+        return pcmcia_socket_dev_resume(&dev->dev);
+}
 /*====================================================================*/
 
-static struct device_driver pcc_driver = {
-        .name = "cfc",
-        .bus = &platform_bus_type,
-        .suspend = pcmcia_socket_dev_suspend,
-        .resume = pcmcia_socket_dev_resume,
+static struct platform_driver pcc_driver = {
+        .driver = {
+                .name           = "cfc",
+                .owner          = THIS_MODULE,
+        },
+        .suspend        = cfc_drv_pcmcia_suspend,
+        .resume         = cfc_drv_pcmcia_resume,
 };
 
 static struct platform_device pcc_device = {
@@ -716,13 +728,13 @@ static int __init init_m32r_pcc(void)
 {
         int i, ret;
 
-        ret = driver_register(&pcc_driver);
+        ret = platform_driver_register(&pcc_driver);
         if (ret)
                 return ret;
 
         ret = platform_device_register(&pcc_device);
         if (ret){
-                driver_unregister(&pcc_driver);
+                platform_driver_unregister(&pcc_driver);
                 return ret;
         }
 
@@ -754,7 +766,7 @@ static int __init init_m32r_pcc(void)
         if (pcc_sockets == 0) {
                 printk("socket is not found.\n");
                 platform_device_unregister(&pcc_device);
-                driver_unregister(&pcc_driver);
+                platform_driver_unregister(&pcc_driver);
                 return -ENODEV;
         }
 
@@ -802,7 +814,7 @@ static void __exit exit_m32r_pcc(void)
         if (poll_interval != 0)
                 del_timer_sync(&poll_timer);
 
-        driver_unregister(&pcc_driver);
+        platform_driver_unregister(&pcc_driver);
 } /* exit_m32r_pcc */
 
 module_init(init_m32r_pcc);
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index 2f108c23dbd9..12034b41d196 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -672,13 +672,25 @@ static struct pccard_operations pcc_operations = {
         .set_mem_map            = pcc_set_mem_map,
 };
 
+static int pcc_drv_pcmcia_suspend(struct platform_device *dev,
+                                     pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int pcc_drv_pcmcia_resume(struct platform_device *dev)
+{
+        return pcmcia_socket_dev_resume(&dev->dev);
+}
 /*====================================================================*/
 
-static struct device_driver pcc_driver = {
-        .name = "pcc",
-        .bus = &platform_bus_type,
-        .suspend = pcmcia_socket_dev_suspend,
-        .resume = pcmcia_socket_dev_resume,
+static struct platform_driver pcc_driver = {
+        .driver = {
+                .name           = "pcc",
+                .owner          = THIS_MODULE,
+        },
+        .suspend        = pcc_drv_pcmcia_suspend,
+        .resume         = pcc_drv_pcmcia_resume,
 };
 
 static struct platform_device pcc_device = {
@@ -692,13 +704,13 @@ static int __init init_m32r_pcc(void)
 {
         int i, ret;
 
-        ret = driver_register(&pcc_driver);
+        ret = platform_driver_register(&pcc_driver);
         if (ret)
                 return ret;
 
         ret = platform_device_register(&pcc_device);
         if (ret){
-                driver_unregister(&pcc_driver);
+                platform_driver_unregister(&pcc_driver);
                 return ret;
         }
 
@@ -715,7 +727,7 @@ static int __init init_m32r_pcc(void)
         if (pcc_sockets == 0) {
                 printk("socket is not found.\n");
                 platform_device_unregister(&pcc_device);
-                driver_unregister(&pcc_driver);
+                platform_driver_unregister(&pcc_driver);
                 return -ENODEV;
         }
 
@@ -763,7 +775,7 @@ static void __exit exit_m32r_pcc(void)
         if (poll_interval != 0)
                 del_timer_sync(&poll_timer);
 
-        driver_unregister(&pcc_driver);
+        platform_driver_unregister(&pcc_driver);
 } /* exit_m32r_pcc */
 
 module_init(init_m32r_pcc);
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index c5b2a44b4c37..d8da5ac844e9 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -65,7 +65,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
 #endif
 };
 
-static int sa11x0_drv_pcmcia_probe(struct device *dev)
+static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)
 {
         int i, ret = -ENODEV;
 
@@ -73,7 +73,7 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev)
          * Initialise any "on-board" PCMCIA sockets.
          */
         for (i = 0; i < ARRAY_SIZE(sa11x0_pcmcia_hw_init); i++) {
-                ret = sa11x0_pcmcia_hw_init[i](dev);
+                ret = sa11x0_pcmcia_hw_init[i](&dev->dev);
                 if (ret == 0)
                         break;
         }
@@ -81,13 +81,31 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev)
         return ret;
 }
 
-static struct device_driver sa11x0_pcmcia_driver = {
+static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
+{
+        return soc_common_drv_pcmcia_remove(&dev->dev);
+}
+
+static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev,
+                                     pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int sa11x0_drv_pcmcia_resume(struct platform_device *dev)
+{
+        return pcmcia_socket_dev_resume(&dev->dev);
+}
+
+static struct platform_driver sa11x0_pcmcia_driver = {
+        .driver = {
+                .name           = "sa11x0-pcmcia",
+                .owner          = THIS_MODULE,
+        },
         .probe          = sa11x0_drv_pcmcia_probe,
-        .remove         = soc_common_drv_pcmcia_remove,
-        .name           = "sa11x0-pcmcia",
-        .bus            = &platform_bus_type,
-        .suspend        = pcmcia_socket_dev_suspend,
-        .resume         = pcmcia_socket_dev_resume,
+        .remove         = sa11x0_drv_pcmcia_remove,
+        .suspend        = sa11x0_drv_pcmcia_suspend,
+        .resume         = sa11x0_drv_pcmcia_resume,
 };
 
 /* sa11x0_pcmcia_init()
@@ -100,7 +118,7 @@ static struct device_driver sa11x0_pcmcia_driver = {
  */
 static int __init sa11x0_pcmcia_init(void)
 {
-        return driver_register(&sa11x0_pcmcia_driver);
+        return platform_driver_register(&sa11x0_pcmcia_driver);
 }
 
 /* sa11x0_pcmcia_exit()
@@ -110,7 +128,7 @@ static int __init sa11x0_pcmcia_init(void)
  */
 static void __exit sa11x0_pcmcia_exit(void)
 {
-        driver_unregister(&sa11x0_pcmcia_driver);
+        platform_driver_unregister(&sa11x0_pcmcia_driver);
 }
 
 MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index 2a613e920fd4..9ad97ea836e8 100644
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -363,13 +363,25 @@ static int __init get_tcic_id(void)
     return id;
 }
 
+static int tcic_drv_pcmcia_suspend(struct platform_device *dev,
+                                     pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int tcic_drv_pcmcia_resume(struct platform_device *dev)
+{
+        return pcmcia_socket_dev_resume(&dev->dev);
+}
 /*====================================================================*/
 
-static struct device_driver tcic_driver = {
-        .name = "tcic-pcmcia",
-        .bus = &platform_bus_type,
-        .suspend = pcmcia_socket_dev_suspend,
-        .resume = pcmcia_socket_dev_resume,
+static struct platform_driver tcic_driver = {
+        .driver = {
+                .name = "tcic-pcmcia",
+                .owner          = THIS_MODULE,
+        },
+        .suspend        = tcic_drv_pcmcia_suspend,
+        .resume         = tcic_drv_pcmcia_resume,
 };
 
 static struct platform_device tcic_device = {
@@ -383,7 +395,7 @@ static int __init init_tcic(void)
     int i, sock, ret = 0;
     u_int mask, scan;
 
-    if (driver_register(&tcic_driver))
+    if (platform_driver_register(&tcic_driver))
         return -1;
     
     printk(KERN_INFO "Databook TCIC-2 PCMCIA probe: ");
@@ -391,7 +403,7 @@ static int __init init_tcic(void)
 
     if (!request_region(tcic_base, 16, "tcic-2")) {
         printk("could not allocate ports,\n ");
-        driver_unregister(&tcic_driver);
+        platform_driver_unregister(&tcic_driver);
         return -ENODEV;
     }
     else {
@@ -414,7 +426,7 @@ static int __init init_tcic(void)
     if (sock == 0) {
         printk("not found.\n");
         release_region(tcic_base, 16);
-        driver_unregister(&tcic_driver);
+        platform_driver_unregister(&tcic_driver);
         return -ENODEV;
     }
 
@@ -542,7 +554,7 @@ static void __exit exit_tcic(void)
     }
 
     platform_device_unregister(&tcic_device);
-    driver_unregister(&tcic_driver);
+    platform_driver_unregister(&tcic_driver);
 } /* exit_tcic */
 
 /*====================================================================*/
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index b2c412419059..659421d0ca46 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -704,24 +704,37 @@ static int __devinit vrc4171_card_setup(char *options)
 
 __setup("vrc4171_card=", vrc4171_card_setup);
 
-static struct device_driver vrc4171_card_driver = {
-        .name           = vrc4171_card_name,
-        .bus            = &platform_bus_type,
-        .suspend        = pcmcia_socket_dev_suspend,
-        .resume         = pcmcia_socket_dev_resume,
+static int vrc4171_card_suspend(struct platform_device *dev,
+                                     pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int vrc4171_card_resume(struct platform_device *dev)
+{
+        return pcmcia_socket_dev_resume(&dev->dev);
+}
+
+static struct platform_driver vrc4171_card_driver = {
+        .driver = {
+                .name           = vrc4171_card_name,
+                .owner          = THIS_MODULE,
+        },
+        .suspend        = vrc4171_card_suspend,
+        .resume         = vrc4171_card_resume,
 };
 
 static int __devinit vrc4171_card_init(void)
 {
         int retval;
 
-        retval = driver_register(&vrc4171_card_driver);
+        retval = platform_driver_register(&vrc4171_card_driver);
         if (retval < 0)
                 return retval;
 
         retval = platform_device_register(&vrc4171_card_device);
         if (retval < 0) {
-                driver_unregister(&vrc4171_card_driver);
+                platform_driver_unregister(&vrc4171_card_driver);
                 return retval;
         }
 
@@ -735,11 +748,12 @@ static int __devinit vrc4171_card_init(void)
         if (retval < 0) {
                 vrc4171_remove_sockets();
                 platform_device_unregister(&vrc4171_card_device);
-                driver_unregister(&vrc4171_card_driver);
+                platform_driver_unregister(&vrc4171_card_driver);
                 return retval;
         }
 
-        printk(KERN_INFO "%s, connected to IRQ %d\n", vrc4171_card_driver.name, vrc4171_irq);
+        printk(KERN_INFO "%s, connected to IRQ %d\n",
+                vrc4171_card_driver.driver.name, vrc4171_irq);
 
         return 0;
 }
@@ -749,7 +763,7 @@ static void __devexit vrc4171_card_exit(void)
         free_irq(vrc4171_irq, vrc4171_sockets);
         vrc4171_remove_sockets();
         platform_device_unregister(&vrc4171_card_device);
-        driver_unregister(&vrc4171_card_driver);
+        platform_driver_unregister(&vrc4171_card_driver);
 }
 
 module_init(vrc4171_card_init);