usb: gadget: Update m66592-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>

diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 3608b3bd57328fca524e6431229d166451992cf4..8981fbb5748ccf4b7acf3207af2ac0e54d65e46c 100644 (file)
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -390,7 +390,7 @@ static int alloc_pipe_config(struct m66592_ep *ep,
        int *counter;
        int ret;
 
-       ep->desc = desc;
+       ep->ep.desc = desc;
 
        BUG_ON(ep->pipenum);
 
@@ -558,7 +558,7 @@ static void start_packet_read(struct m66592_ep *ep, struct m66592_request *req)
 
 static void start_packet(struct m66592_ep *ep, struct m66592_request *req)
 {
-       if (ep->desc->bEndpointAddress & USB_DIR_IN)
+       if (ep->ep.desc->bEndpointAddress & USB_DIR_IN)
                start_packet_write(ep, req);
        else
                start_packet_read(ep, req);
@@ -734,7 +734,7 @@ __acquires(m66592->lock)
 
        if (restart) {
                req = list_entry(ep->queue.next, struct m66592_request, queue);
-               if (ep->desc)
+               if (ep->ep.desc)
                        start_packet(ep, req);
        }
 }
@@ -917,7 +917,7 @@ static void irq_pipe_ready(struct m66592 *m66592, u16 status, u16 enb)
                                ep = m66592->pipenum2ep[pipenum];
                                req = list_entry(ep->queue.next,
                                                 struct m66592_request, queue);
-                               if (ep->desc->bEndpointAddress & USB_DIR_IN)
+                               if (ep->ep.desc->bEndpointAddress & USB_DIR_IN)
                                        irq_packet_write(ep, req);
                                else
                                        irq_packet_read(ep, req);
@@ -1377,7 +1377,7 @@ static int m66592_queue(struct usb_ep *_ep, struct usb_request *_req,
        req->req.actual = 0;
        req->req.status = -EINPROGRESS;
 
-       if (ep->desc == NULL)   /* control */
+       if (ep->ep.desc == NULL)        /* control */
                start_ep0(ep, req);
        else {
                if (request && !ep->busy)

diff --git a/drivers/usb/gadget/m66592-udc.h b/drivers/usb/gadget/m66592-udc.h
index 9d9f7e39f037e16a4efbc5cb51ec344cd7951734..88c85b4116a2f1234820db626982b0b3bcedd9f5 100644 (file)
--- a/drivers/usb/gadget/m66592-udc.h
+++ b/drivers/usb/gadget/m66592-udc.h
@@ -456,7 +456,7 @@ struct m66592_ep {
        unsigned                use_dma:1;
        u16                     pipenum;
        u16                     type;
-       const struct usb_endpoint_descriptor    *desc;
+
        /* register address */
        unsigned long           fifoaddr;
        unsigned long           fifosel;