usb: gadget: Update at91_udc to use usb_endpoint_descriptor inside the struct usb_ep

Remove redundant pointer to struct usb_endpoint_descriptor.

Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>

2 files changed, 7 insertions, 11 deletions

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 9d7bcd910074..86cc9097a5cf 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -212,7 +212,7 @@ static int proc_udc_show(struct seq_file *s, void *unused)
         if (udc->enabled && udc->vbus) {
                 proc_ep_show(s, &udc->ep[0]);
                 list_for_each_entry (ep, &udc->gadget.ep_list, ep.ep_list) {
-                        if (ep->desc)
+                        if (ep->ep.desc)
                                 proc_ep_show(s, ep);
                 }
         }
@@ -530,7 +530,7 @@ ok:
         tmp |= AT91_UDP_EPEDS;
         __raw_writel(tmp, ep->creg);
 
-        ep->desc = desc;
+        ep->ep.desc = desc;
         ep->ep.maxpacket = maxpacket;
 
         /*
@@ -558,7 +558,6 @@ static int at91_ep_disable (struct usb_ep * _ep)
         nuke(ep, -ESHUTDOWN);
 
         /* restore the endpoint's pristine config */
-        ep->desc = NULL;
         ep->ep.desc = NULL;
         ep->ep.maxpacket = ep->maxpacket;
 
@@ -618,7 +617,7 @@ static int at91_ep_queue(struct usb_ep *_ep,
                 return -EINVAL;
         }
 
-        if (!_ep || (!ep->desc && ep->ep.name != ep0name)) {
+        if (!_ep || (!ep->ep.desc && ep->ep.name != ep0name)) {
                 DBG("invalid ep\n");
                 return -EINVAL;
         }
@@ -833,7 +832,7 @@ static void udc_reinit(struct at91_udc *udc)
 
                 if (i != 0)
                         list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
-                ep->desc = NULL;
+                ep->ep.desc = NULL;
                 ep->stopped = 0;
                 ep->fifo_bank = 0;
                 ep->ep.maxpacket = ep->maxpacket;
@@ -1172,7 +1171,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
                         | USB_REQ_GET_STATUS:
                 tmp = w_index & USB_ENDPOINT_NUMBER_MASK;
                 ep = &udc->ep[tmp];
-                if (tmp >= NUM_ENDPOINTS || (tmp && !ep->desc))
+                if (tmp >= NUM_ENDPOINTS || (tmp && !ep->ep.desc))
                         goto stall;
 
                 if (tmp) {
@@ -1197,7 +1196,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
                 ep = &udc->ep[tmp];
                 if (w_value != USB_ENDPOINT_HALT || tmp >= NUM_ENDPOINTS)
                         goto stall;
-                if (!ep->desc || ep->is_iso)
+                if (!ep->ep.desc || ep->is_iso)
                         goto stall;
                 if ((w_index & USB_DIR_IN)) {
                         if (!ep->is_in)
@@ -1218,7 +1217,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
                         goto stall;
                 if (tmp == 0)
                         goto succeed;
-                if (!ep->desc || ep->is_iso)
+                if (!ep->ep.desc || ep->is_iso)
                         goto stall;
                 if ((w_index & USB_DIR_IN)) {
                         if (!ep->is_in)
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 3c0315b86ace..e647d1c2ada4 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -105,9 +105,6 @@ struct at91_ep {
         unsigned                        is_in:1;
         unsigned                        is_iso:1;
         unsigned                        fifo_bank:1;
-
-        const struct usb_endpoint_descriptor
-                                        *desc;
 };
 
 /*