Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB merge for 3.9-rc1

  Nothing major, lots of gadget fixes, and of course, xhci stuff.

  All of this has been in linux-next for a while, with the exception of
  the last 3 patches, which were reverts of patches in the tree that
  caused problems, they went in yesterday."

* tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits)
  Revert "USB: EHCI: make ehci-vt8500 a separate driver"
  Revert "USB: EHCI: make ehci-orion a separate driver"
  Revert "USB: update host controller Kconfig entries"
  USB: update host controller Kconfig entries
  USB: EHCI: make ehci-orion a separate driver
  USB: EHCI: make ehci-vt8500 a separate driver
  USB: usb-storage: unusual_devs update for Super TOP SATA bridge
  USB: ehci-omap: Fix autoloading of module
  USB: ehci-omap: Don't free gpios that we didn't request
  USB: option: add Huawei "ACM" devices using protocol = vendor
  USB: serial: fix null-pointer dereferences on disconnect
  USB: option: add Yota / Megafon M100-1 4g modem
  drivers/usb: add missing GENERIC_HARDIRQS dependencies
  USB: storage: properly handle the endian issues of idProduct
  testusb: remove all mentions of 'usbfs'
  usb: gadget: imx_udc: make it depend on BROKEN
  usb: omap_control_usb: fix compile warning
  ARM: OMAP: USB: Add phy binding information
  ARM: OMAP2: MUSB: Specify omap4 has mailbox
  ARM: OMAP: devices: create device for usb part of control module
  ...

1 files changed, 19 insertions, 48 deletions

diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index fc7cb09ab52b..066cb89376de 100644
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -1308,65 +1308,28 @@ static void init_controller(struct fusb300 *fusb300)
         iowrite32(0xcfffff9f, fusb300->reg + FUSB300_OFFSET_IGER1);
 }
 /*------------------------------------------------------------------------*/
-static struct fusb300 *the_controller;
-
-static int fusb300_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int fusb300_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct fusb300 *fusb300 = the_controller;
-        int retval;
-
-        if (!driver
-                        || driver->max_speed < USB_SPEED_FULL
-                        || !bind
-                        || !driver->setup)
-                return -EINVAL;
-
-        if (!fusb300)
-                return -ENODEV;
-
-        if (fusb300->driver)
-                return -EBUSY;
+        struct fusb300 *fusb300 = to_fusb300(g);
 
         /* hook up the driver */
         driver->driver.bus = NULL;
         fusb300->driver = driver;
         fusb300->gadget.dev.driver = &driver->driver;
 
-        retval = device_add(&fusb300->gadget.dev);
-        if (retval) {
-                pr_err("device_add error (%d)\n", retval);
-                goto error;
-        }
-
-        retval = bind(&fusb300->gadget, driver);
-        if (retval) {
-                pr_err("bind to driver error (%d)\n", retval);
-                device_del(&fusb300->gadget.dev);
-                goto error;
-        }
-
         return 0;
-
-error:
-        fusb300->driver = NULL;
-        fusb300->gadget.dev.driver = NULL;
-
-        return retval;
 }
 
-static int fusb300_udc_stop(struct usb_gadget_driver *driver)
+static int fusb300_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct fusb300 *fusb300 = the_controller;
-
-        if (driver != fusb300->driver || !driver->unbind)
-                return -EINVAL;
+        struct fusb300 *fusb300 = to_fusb300(g);
 
         driver->unbind(&fusb300->gadget);
         fusb300->gadget.dev.driver = NULL;
 
         init_controller(fusb300);
-        device_del(&fusb300->gadget.dev);
         fusb300->driver = NULL;
 
         return 0;
@@ -1378,10 +1341,10 @@ static int fusb300_udc_pullup(struct usb_gadget *_gadget, int is_active)
         return 0;
 }
 
-static struct usb_gadget_ops fusb300_gadget_ops = {
+static const struct usb_gadget_ops fusb300_gadget_ops = {
         .pullup         = fusb300_udc_pullup,
-        .start          = fusb300_udc_start,
-        .stop           = fusb300_udc_stop,
+        .udc_start      = fusb300_udc_start,
+        .udc_stop       = fusb300_udc_stop,
 };
 
 static int __exit fusb300_remove(struct platform_device *pdev)
@@ -1505,8 +1468,6 @@ static int __init fusb300_probe(struct platform_device *pdev)
         fusb300->gadget.ep0 = &fusb300->ep[0]->ep;
         INIT_LIST_HEAD(&fusb300->gadget.ep0->ep_list);
 
-        the_controller = fusb300;
-
         fusb300->ep0_req = fusb300_alloc_request(&fusb300->ep[0]->ep,
                                 GFP_KERNEL);
         if (fusb300->ep0_req == NULL)
@@ -1517,9 +1478,19 @@ static int __init fusb300_probe(struct platform_device *pdev)
         if (ret)
                 goto err_add_udc;
 
+        ret = device_add(&fusb300->gadget.dev);
+        if (ret) {
+                pr_err("device_add error (%d)\n", ret);
+                goto err_add_device;
+        }
+
         dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
 
         return 0;
+
+err_add_device:
+        usb_del_gadget_udc(&fusb300->gadget);
+
 err_add_udc:
         fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req);