1 files changed, 28 insertions, 33 deletions

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 5607c0ae6835..a7722a6a5a5b 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1631,24 +1631,21 @@ static struct hc_driver sl811h_hc_driver = {
 /*-------------------------------------------------------------------------*/
 
 static int __devexit
-sl811h_remove(struct device *dev)
+sl811h_remove(struct platform_device *dev)
 {
-        struct usb_hcd          *hcd = dev_get_drvdata(dev);
+        struct usb_hcd          *hcd = platform_get_drvdata(dev);
         struct sl811            *sl811 = hcd_to_sl811(hcd);
-        struct platform_device  *pdev;
         struct resource         *res;
 
-        pdev = container_of(dev, struct platform_device, dev);
-
         remove_debug_file(sl811);
         usb_remove_hcd(hcd);
 
         /* some platforms may use IORESOURCE_IO */
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 1);
         if (res)
                 iounmap(sl811->data_reg);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (res)
                 iounmap(sl811->addr_reg);
 
@@ -1657,11 +1654,10 @@ sl811h_remove(struct device *dev)
 }
 
 static int __devinit
-sl811h_probe(struct device *dev)
+sl811h_probe(struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
         struct sl811            *sl811;
-        struct platform_device  *pdev;
         struct resource         *addr, *data;
         int                     irq;
         void __iomem            *addr_reg;
@@ -1674,24 +1670,23 @@ sl811h_probe(struct device *dev)
          * specific platform_data.  we don't probe for IRQs, and do only
          * minimal sanity checking.
          */
-        pdev = container_of(dev, struct platform_device, dev);
-        irq = platform_get_irq(pdev, 0);
-        if (pdev->num_resources < 3 || irq < 0)
+        irq = platform_get_irq(dev, 0);
+        if (dev->num_resources < 3 || irq < 0)
                 return -ENODEV;
 
         /* refuse to confuse usbcore */
-        if (dev->dma_mask) {
+        if (dev->dev.dma_mask) {
                 DBG("no we won't dma\n");
                 return -EINVAL;
         }
 
         /* the chip may be wired for either kind of addressing */
-        addr = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        data = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        addr = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        data = platform_get_resource(dev, IORESOURCE_MEM, 1);
         retval = -EBUSY;
         if (!addr || !data) {
-                addr = platform_get_resource(pdev, IORESOURCE_IO, 0);
-                data = platform_get_resource(pdev, IORESOURCE_IO, 1);
+                addr = platform_get_resource(dev, IORESOURCE_IO, 0);
+                data = platform_get_resource(dev, IORESOURCE_IO, 1);
                 if (!addr || !data)
                         return -ENODEV;
                 ioaddr = 1;
@@ -1713,7 +1708,7 @@ sl811h_probe(struct device *dev)
         }
 
         /* allocate and initialize hcd */
-        hcd = usb_create_hcd(&sl811h_hc_driver, dev, dev->bus_id);
+        hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev->dev.bus_id);
         if (!hcd) {
                 retval = -ENOMEM;
                 goto err5;
@@ -1723,7 +1718,7 @@ sl811h_probe(struct device *dev)
 
         spin_lock_init(&sl811->lock);
         INIT_LIST_HEAD(&sl811->async);
-        sl811->board = dev->platform_data;
+        sl811->board = dev->dev.platform_data;
         init_timer(&sl811->timer);
         sl811->timer.function = sl811h_timer;
         sl811->timer.data = (unsigned long) sl811;
@@ -1785,9 +1780,9 @@ sl811h_probe(struct device *dev)
  */
 
 static int
-sl811h_suspend(struct device *dev, pm_message_t state)
+sl811h_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct usb_hcd  *hcd = dev_get_drvdata(dev);
+        struct usb_hcd  *hcd = platform_get_drvdata(dev);
         struct sl811    *sl811 = hcd_to_sl811(hcd);
         int             retval = 0;
 
@@ -1796,27 +1791,27 @@ sl811h_suspend(struct device *dev, pm_message_t state)
         else if (state.event == PM_EVENT_SUSPEND)
                 port_power(sl811, 0);
         if (retval == 0)
-                dev->power.power_state = state;
+                dev->dev.power.power_state = state;
         return retval;
 }
 
 static int
-sl811h_resume(struct device *dev)
+sl811h_resume(struct platform_device *dev)
 {
-        struct usb_hcd  *hcd = dev_get_drvdata(dev);
+        struct usb_hcd  *hcd = platform_get_drvdata(dev);
         struct sl811    *sl811 = hcd_to_sl811(hcd);
 
         /* with no "check to see if VBUS is still powered" board hook,
          * let's assume it'd only be powered to enable remote wakeup.
          */
-        if (dev->power.power_state.event == PM_EVENT_SUSPEND
+        if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND
                         || !hcd->can_wakeup) {
                 sl811->port1 = 0;
                 port_power(sl811, 1);
                 return 0;
         }
 
-        dev->power.power_state = PMSG_ON;
+        dev->dev.power.power_state = PMSG_ON;
         return sl811h_bus_resume(hcd);
 }
 
@@ -1829,16 +1824,16 @@ sl811h_resume(struct device *dev)
 
 
 /* this driver is exported so sl811_cs can depend on it */
-struct device_driver sl811h_driver = {
-        .name =         (char *) hcd_name,
-        .bus =          &platform_bus_type,
-        .owner =        THIS_MODULE,
-
+struct platform_driver sl811h_driver = {
         .probe =        sl811h_probe,
         .remove =       __devexit_p(sl811h_remove),
 
         .suspend =      sl811h_suspend,
         .resume =       sl811h_resume,
+        .driver = {
+                .name = (char *) hcd_name,
+                .owner = THIS_MODULE,
+        },
 };
 EXPORT_SYMBOL(sl811h_driver);
 
@@ -1850,12 +1845,12 @@ static int __init sl811h_init(void)
                 return -ENODEV;
 
         INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
-        return driver_register(&sl811h_driver);
+        return platform_driver_register(&sl811h_driver);
 }
 module_init(sl811h_init);
 
 static void __exit sl811h_cleanup(void)
 {
-        driver_unregister(&sl811h_driver);
+        platform_driver_unregister(&sl811h_driver);
 }
 module_exit(sl811h_cleanup);