1 files changed, 24 insertions, 52 deletions

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 9f98508966d..e23bf7984aa 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -599,13 +599,13 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
 
         spin_lock_irqsave(&ep->udc->lock, flags);
 
-        if (ep->desc) {
+        if (ep->ep.desc) {
                 spin_unlock_irqrestore(&ep->udc->lock, flags);
                 DBG(DBG_ERR, "ep%d already enabled\n", ep->index);
                 return -EBUSY;
         }
 
-        ep->desc = desc;
+        ep->ep.desc = desc;
         ep->ep.maxpacket = maxpacket;
 
         usba_ep_writel(ep, CFG, ept_cfg);
@@ -647,7 +647,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
 
         spin_lock_irqsave(&udc->lock, flags);
 
-        if (!ep->desc) {
+        if (!ep->ep.desc) {
                 spin_unlock_irqrestore(&udc->lock, flags);
                 /* REVISIT because this driver disables endpoints in
                  * reset_all_endpoints() before calling disconnect(),
@@ -658,7 +658,6 @@ static int usba_ep_disable(struct usb_ep *_ep)
                                         ep->ep.name);
                 return -EINVAL;
         }
-        ep->desc = NULL;
         ep->ep.desc = NULL;
 
         list_splice_init(&ep->queue, &req_list);
@@ -752,7 +751,7 @@ static int queue_dma(struct usba_udc *udc, struct usba_ep *ep,
          */
         ret = -ESHUTDOWN;
         spin_lock_irqsave(&udc->lock, flags);
-        if (ep->desc) {
+        if (ep->ep.desc) {
                 if (list_empty(&ep->queue))
                         submit_request(ep, req);
 
@@ -776,7 +775,8 @@ usba_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
         DBG(DBG_GADGET | DBG_QUEUE | DBG_REQ, "%s: queue req %p, len %u\n",
                         ep->ep.name, req, _req->length);
 
-        if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN || !ep->desc)
+        if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN ||
+            !ep->ep.desc)
                 return -ESHUTDOWN;
 
         req->submitted = 0;
@@ -792,7 +792,7 @@ usba_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
         /* May have received a reset since last time we checked */
         ret = -ESHUTDOWN;
         spin_lock_irqsave(&udc->lock, flags);
-        if (ep->desc) {
+        if (ep->ep.desc) {
                 list_add_tail(&req->queue, &ep->queue);
 
                 if ((!ep_is_control(ep) && ep->is_in) ||
@@ -905,7 +905,7 @@ static int usba_ep_set_halt(struct usb_ep *_ep, int value)
         DBG(DBG_GADGET, "endpoint %s: %s HALT\n", ep->ep.name,
                         value ? "set" : "clear");
 
-        if (!ep->desc) {
+        if (!ep->ep.desc) {
                 DBG(DBG_ERR, "Attempted to halt uninitialized ep %s\n",
                                 ep->ep.name);
                 return -ENODEV;
@@ -1008,16 +1008,16 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
         return 0;
 }
 
-static int atmel_usba_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *));
-static int atmel_usba_stop(struct usb_gadget_driver *driver);
-
+static int atmel_usba_start(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver);
+static int atmel_usba_stop(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver);
 static const struct usb_gadget_ops usba_udc_ops = {
         .get_frame              = usba_udc_get_frame,
         .wakeup                 = usba_udc_wakeup,
         .set_selfpowered        = usba_udc_set_selfpowered,
-        .start                  = atmel_usba_start,
-        .stop                   = atmel_usba_stop,
+        .udc_start              = atmel_usba_start,
+        .udc_stop               = atmel_usba_stop,
 };
 
 static struct usb_endpoint_descriptor usba_ep0_desc = {
@@ -1071,7 +1071,7 @@ static void reset_all_endpoints(struct usba_udc *udc)
          * FIXME remove this code ... and retest thoroughly.
          */
         list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {
-                if (ep->desc) {
+                if (ep->ep.desc) {
                         spin_unlock(&udc->lock);
                         usba_ep_disable(&ep->ep);
                         spin_lock(&udc->lock);
@@ -1089,9 +1089,9 @@ static struct usba_ep *get_ep_by_addr(struct usba_udc *udc, u16 wIndex)
         list_for_each_entry (ep, &udc->gadget.ep_list, ep.ep_list) {
                 u8 bEndpointAddress;
 
-                if (!ep->desc)
+                if (!ep->ep.desc)
                         continue;
-                bEndpointAddress = ep->desc->bEndpointAddress;
+                bEndpointAddress = ep->ep.desc->bEndpointAddress;
                 if ((wIndex ^ bEndpointAddress) & USB_DIR_IN)
                         continue;
                 if ((bEndpointAddress & USB_ENDPOINT_NUMBER_MASK)
@@ -1727,7 +1727,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
                     usb_speed_string(udc->gadget.speed));
 
                 ep0 = &usba_ep[0];
-                ep0->desc = &usba_ep0_desc;
+                ep0->ep.desc = &usba_ep0_desc;
                 ep0->state = WAIT_FOR_SETUP;
                 usba_ep_writel(ep0, CFG,
                                 (USBA_BF(EPT_SIZE, EP0_EPT_SIZE)
@@ -1795,21 +1795,13 @@ out:
         return IRQ_HANDLED;
 }
 
-static int atmel_usba_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *))
+static int atmel_usba_start(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver)
 {
-        struct usba_udc *udc = &the_udc;
+        struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
         unsigned long flags;
-        int ret;
-
-        if (!udc->pdev)
-                return -ENODEV;
 
         spin_lock_irqsave(&udc->lock, flags);
-        if (udc->driver) {
-                spin_unlock_irqrestore(&udc->lock, flags);
-                return -EBUSY;
-        }
 
         udc->devstatus = 1 << USB_DEVICE_SELF_POWERED;
         udc->driver = driver;
@@ -1819,13 +1811,6 @@ static int atmel_usba_start(struct usb_gadget_driver *driver,
         clk_enable(udc->pclk);
         clk_enable(udc->hclk);
 
-        ret = bind(&udc->gadget);
-        if (ret) {
-                DBG(DBG_ERR, "Could not bind to driver %s: error %d\n",
-                        driver->driver.name, ret);
-                goto err_driver_bind;
-        }
-
         DBG(DBG_GADGET, "registered driver `%s'\n", driver->driver.name);
 
         udc->vbus_prev = 0;
@@ -1842,23 +1827,14 @@ static int atmel_usba_start(struct usb_gadget_driver *driver,
         spin_unlock_irqrestore(&udc->lock, flags);
 
         return 0;
-
-err_driver_bind:
-        udc->driver = NULL;
-        udc->gadget.dev.driver = NULL;
-        return ret;
 }
 
-static int atmel_usba_stop(struct usb_gadget_driver *driver)
+static int atmel_usba_stop(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver)
 {
-        struct usba_udc *udc = &the_udc;
+        struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
         unsigned long flags;
 
-        if (!udc->pdev)
-                return -ENODEV;
-        if (driver != udc->driver || !driver->unbind)
-                return -EINVAL;
-
         if (gpio_is_valid(udc->vbus_pin))
                 disable_irq(gpio_to_irq(udc->vbus_pin));
 
@@ -1871,10 +1847,6 @@ static int atmel_usba_stop(struct usb_gadget_driver *driver)
         toggle_bias(0);
         usba_writel(udc, CTRL, USBA_DISABLE_MASK);
 
-        if (udc->driver->disconnect)
-                udc->driver->disconnect(&udc->gadget);
-
-        driver->unbind(&udc->gadget);
         udc->gadget.dev.driver = NULL;
         udc->driver = NULL;