[PATCH v2 3/7] usb: gadget: udc: atmel: simplify endpoint allocation

[cristian.birsan]

From: Cristian Birsan <cristian.bir...@microchip.com>

Simplify the endpoint allocation and cleanup the code.

Signed-off-by: Cristian Birsan <cristian.bir...@microchip.com>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 21 ++++++++-------------
 drivers/usb/gadget/udc/atmel_usba_udc.h |  1 -
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c 
b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 2b154085dc6a..beb7246935a8 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -1097,7 +1097,6 @@ static struct usb_ep *atmel_usba_match_ep(struct 
usb_gadget *gadget,
 
                ep->ept_cfg |= USBA_BF(BK_NUMBER, ep->nr_banks);
 
-               ep->udc->configured_ep++;
        }
 
        return _ep;
@@ -1790,7 +1789,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
 
        if (status & USBA_END_OF_RESET) {
                struct usba_ep *ep0, *ep;
-               int i, n;
+               int i;
 
                usba_writel(udc, INT_CLR,
                        USBA_END_OF_RESET|USBA_END_OF_RESUME
@@ -1838,13 +1837,14 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
                                "ODD: EP0 configuration is invalid!\n");
 
                /* Preallocate other endpoints */
-               n = fifo_mode ? udc->num_ep : udc->configured_ep;
-               for (i = 1; i < n; i++) {
+               for (i = 1; i < udc->num_ep; i++) {
                        ep = &udc->usba_ep[i];
-                       usba_ep_writel(ep, CFG, ep->ept_cfg);
-                       if (!(usba_ep_readl(ep, CFG) & USBA_EPT_MAPPED))
-                               dev_err(&udc->pdev->dev,
-                                       "ODD: EP%d configuration is 
invalid!\n", i);
+                       if (ep->ep.claimed) {
+                               usba_ep_writel(ep, CFG, ep->ept_cfg);
+                               if (!(usba_ep_readl(ep, CFG) & USBA_EPT_MAPPED))
+                                       dev_err(&udc->pdev->dev,
+                                               "ODD: EP%d configuration is 
invalid!\n", i);
+                       }
                }
        }
 
@@ -2011,10 +2011,6 @@ static int atmel_usba_stop(struct usb_gadget *gadget)
        if (udc->vbus_pin)
                disable_irq(gpiod_to_irq(udc->vbus_pin));
 
-       if (fifo_mode == 0)
-               udc->configured_ep = 1;
-
-       udc->suspended = false;
        usba_stop(udc);
 
        udc->driver = NULL;
@@ -2095,7 +2091,6 @@ static struct usba_ep * atmel_udc_of_init(struct 
platform_device *pdev,
                pp = NULL;
                while ((pp = of_get_next_child(np, pp)))
                        udc->num_ep++;
-               udc->configured_ep = 1;
        } else {
                udc->num_ep = usba_config_fifo_table(udc);
        }
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h 
b/drivers/usb/gadget/udc/atmel_usba_udc.h
index a0225e4543d4..8de79356d31d 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.h
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.h
@@ -324,7 +324,6 @@ struct usba_udc {
        int irq;
        struct gpio_desc *vbus_pin;
        int num_ep;
-       int configured_ep;
        struct usba_fifo_cfg *fifo_cfg;
        struct clk *pclk;
        struct clk *hclk;
-- 
2.17.1