1 files changed, 41 insertions, 57 deletions

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index cbe44535c0f0..66293105d136 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -365,16 +365,14 @@ dummy_enable (struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
                 case USB_SPEED_HIGH:
                         if (max == 512)
                                 break;
-                        /* conserve return statements */
-                default:
-                        switch (max) {
-                        case 8: case 16: case 32: case 64:
+                        goto done;
+                case USB_SPEED_FULL:
+                        if (max == 8 || max == 16 || max == 32 || max == 64)
                                 /* we'll fake any legal size */
                                 break;
-                        default:
-                case USB_SPEED_LOW:
-                                goto done;
-                        }
+                        /* save a return statement */
+                default:
+                        goto done;
                 }
                 break;
         case USB_ENDPOINT_XFER_INT:
@@ -894,13 +892,12 @@ static int dummy_udc_suspend (struct platform_device *pdev, pm_message_t state)
 {
         struct dummy    *dum = platform_get_drvdata(pdev);
 
-        dev_dbg (&pdev->dev, "%s\n", __FUNCTION__);
+        dev_dbg (&pdev->dev, "%s\n", __func__);
         spin_lock_irq (&dum->lock);
         dum->udc_suspended = 1;
         set_link_state (dum);
         spin_unlock_irq (&dum->lock);
 
-        pdev->dev.power.power_state = state;
         usb_hcd_poll_rh_status (dummy_to_hcd (dum));
         return 0;
 }
@@ -909,13 +906,12 @@ static int dummy_udc_resume (struct platform_device *pdev)
 {
         struct dummy    *dum = platform_get_drvdata(pdev);
 
-        dev_dbg (&pdev->dev, "%s\n", __FUNCTION__);
+        dev_dbg (&pdev->dev, "%s\n", __func__);
         spin_lock_irq (&dum->lock);
         dum->udc_suspended = 0;
         set_link_state (dum);
         spin_unlock_irq (&dum->lock);
 
-        pdev->dev.power.power_state = PMSG_ON;
         usb_hcd_poll_rh_status (dummy_to_hcd (dum));
         return 0;
 }
@@ -1711,7 +1707,7 @@ static int dummy_bus_suspend (struct usb_hcd *hcd)
 {
         struct dummy *dum = hcd_to_dummy (hcd);
 
-        dev_dbg (&hcd->self.root_hub->dev, "%s\n", __FUNCTION__);
+        dev_dbg (&hcd->self.root_hub->dev, "%s\n", __func__);
 
         spin_lock_irq (&dum->lock);
         dum->rh_state = DUMMY_RH_SUSPENDED;
@@ -1726,7 +1722,7 @@ static int dummy_bus_resume (struct usb_hcd *hcd)
         struct dummy *dum = hcd_to_dummy (hcd);
         int rc = 0;
 
-        dev_dbg (&hcd->self.root_hub->dev, "%s\n", __FUNCTION__);
+        dev_dbg (&hcd->self.root_hub->dev, "%s\n", __func__);
 
         spin_lock_irq (&dum->lock);
         if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
@@ -1900,7 +1896,7 @@ static int dummy_hcd_suspend (struct platform_device *pdev, pm_message_t state)
         struct dummy            *dum;
         int                     rc = 0;
 
-        dev_dbg (&pdev->dev, "%s\n", __FUNCTION__);
+        dev_dbg (&pdev->dev, "%s\n", __func__);
 
         hcd = platform_get_drvdata (pdev);
         dum = hcd_to_dummy (hcd);
@@ -1916,7 +1912,7 @@ static int dummy_hcd_resume (struct platform_device *pdev)
 {
         struct usb_hcd          *hcd;
 
-        dev_dbg (&pdev->dev, "%s\n", __FUNCTION__);
+        dev_dbg (&pdev->dev, "%s\n", __func__);
 
         hcd = platform_get_drvdata (pdev);
         set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
@@ -1937,69 +1933,57 @@ static struct platform_driver dummy_hcd_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-/* These don't need to do anything because the pdev structures are
- * statically allocated. */
-static void
-dummy_udc_release (struct device *dev) {}
-
-static void
-dummy_hcd_release (struct device *dev) {}
-
-static struct platform_device           the_udc_pdev = {
-        .name           = (char *) gadget_name,
-        .id             = -1,
-        .dev            = {
-                .release        = dummy_udc_release,
-        },
-};
-
-static struct platform_device           the_hcd_pdev = {
-        .name           = (char *) driver_name,
-        .id             = -1,
-        .dev            = {
-                .release        = dummy_hcd_release,
-        },
-};
+static struct platform_device *the_udc_pdev;
+static struct platform_device *the_hcd_pdev;
 
 static int __init init (void)
 {
-        int     retval;
+        int     retval = -ENOMEM;
 
         if (usb_disabled ())
                 return -ENODEV;
 
-        retval = platform_driver_register (&dummy_hcd_driver);
-        if (retval < 0)
+        the_hcd_pdev = platform_device_alloc(driver_name, -1);
+        if (!the_hcd_pdev)
                 return retval;
+        the_udc_pdev = platform_device_alloc(gadget_name, -1);
+        if (!the_udc_pdev)
+                goto err_alloc_udc;
 
-        retval = platform_driver_register (&dummy_udc_driver);
+        retval = platform_driver_register(&dummy_hcd_driver);
+        if (retval < 0)
+                goto err_register_hcd_driver;
+        retval = platform_driver_register(&dummy_udc_driver);
         if (retval < 0)
                 goto err_register_udc_driver;
 
-        retval = platform_device_register (&the_hcd_pdev);
+        retval = platform_device_add(the_hcd_pdev);
         if (retval < 0)
-                goto err_register_hcd;
-
-        retval = platform_device_register (&the_udc_pdev);
+                goto err_add_hcd;
+        retval = platform_device_add(the_udc_pdev);
         if (retval < 0)
-                goto err_register_udc;
+                goto err_add_udc;
         return retval;
 
-err_register_udc:
-        platform_device_unregister (&the_hcd_pdev);
-err_register_hcd:
-        platform_driver_unregister (&dummy_udc_driver);
+err_add_udc:
+        platform_device_del(the_hcd_pdev);
+err_add_hcd:
+        platform_driver_unregister(&dummy_udc_driver);
 err_register_udc_driver:
-        platform_driver_unregister (&dummy_hcd_driver);
+        platform_driver_unregister(&dummy_hcd_driver);
+err_register_hcd_driver:
+        platform_device_put(the_udc_pdev);
+err_alloc_udc:
+        platform_device_put(the_hcd_pdev);
         return retval;
 }
 module_init (init);
 
 static void __exit cleanup (void)
 {
-        platform_device_unregister (&the_udc_pdev);
-        platform_device_unregister (&the_hcd_pdev);
-        platform_driver_unregister (&dummy_udc_driver);
-        platform_driver_unregister (&dummy_hcd_driver);
+        platform_device_unregister(the_udc_pdev);
+        platform_device_unregister(the_hcd_pdev);
+        platform_driver_unregister(&dummy_udc_driver);
+        platform_driver_unregister(&dummy_hcd_driver);
 }
 module_exit (cleanup);