Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Ido Shayevitz and committed by
Felipe Balbi
978def1c 5a6506f0

+12 -13
+12 -12
drivers/usb/gadget/atmel_usba_udc.c
··· 599 599 600 600 spin_lock_irqsave(&ep->udc->lock, flags); 601 601 602 - if (ep->desc) { 602 + if (ep->ep.desc) { 603 603 spin_unlock_irqrestore(&ep->udc->lock, flags); 604 604 DBG(DBG_ERR, "ep%d already enabled\n", ep->index); 605 605 return -EBUSY; 606 606 } 607 607 608 - ep->desc = desc; 608 + ep->ep.desc = desc; 609 609 ep->ep.maxpacket = maxpacket; 610 610 611 611 usba_ep_writel(ep, CFG, ept_cfg); ··· 647 647 648 648 spin_lock_irqsave(&udc->lock, flags); 649 649 650 - if (!ep->desc) { 650 + if (!ep->ep.desc) { 651 651 spin_unlock_irqrestore(&udc->lock, flags); 652 652 /* REVISIT because this driver disables endpoints in 653 653 * reset_all_endpoints() before calling disconnect(), ··· 658 658 ep->ep.name); 659 659 return -EINVAL; 660 660 } 661 - ep->desc = NULL; 662 661 ep->ep.desc = NULL; 663 662 664 663 list_splice_init(&ep->queue, &req_list); ··· 751 752 */ 752 753 ret = -ESHUTDOWN; 753 754 spin_lock_irqsave(&udc->lock, flags); 754 - if (ep->desc) { 755 + if (ep->ep.desc) { 755 756 if (list_empty(&ep->queue)) 756 757 submit_request(ep, req); 757 758 ··· 775 776 DBG(DBG_GADGET | DBG_QUEUE | DBG_REQ, "%s: queue req %p, len %u\n", 776 777 ep->ep.name, req, _req->length); 777 778 778 - if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN || !ep->desc) 779 + if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN || 780 + !ep->ep.desc) 779 781 return -ESHUTDOWN; 780 782 781 783 req->submitted = 0; ··· 792 792 /* May have received a reset since last time we checked */ 793 793 ret = -ESHUTDOWN; 794 794 spin_lock_irqsave(&udc->lock, flags); 795 - if (ep->desc) { 795 + if (ep->ep.desc) { 796 796 list_add_tail(&req->queue, &ep->queue); 797 797 798 798 if ((!ep_is_control(ep) && ep->is_in) || ··· 905 905 DBG(DBG_GADGET, "endpoint %s: %s HALT\n", ep->ep.name, 906 906 value ? "set" : "clear"); 907 907 908 - if (!ep->desc) { 908 + if (!ep->ep.desc) { 909 909 DBG(DBG_ERR, "Attempted to halt uninitialized ep %s\n", 910 910 ep->ep.name); 911 911 return -ENODEV; ··· 1071 1071 * FIXME remove this code ... and retest thoroughly. 1072 1072 */ 1073 1073 list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) { 1074 - if (ep->desc) { 1074 + if (ep->ep.desc) { 1075 1075 spin_unlock(&udc->lock); 1076 1076 usba_ep_disable(&ep->ep); 1077 1077 spin_lock(&udc->lock); ··· 1089 1089 list_for_each_entry (ep, &udc->gadget.ep_list, ep.ep_list) { 1090 1090 u8 bEndpointAddress; 1091 1091 1092 - if (!ep->desc) 1092 + if (!ep->ep.desc) 1093 1093 continue; 1094 - bEndpointAddress = ep->desc->bEndpointAddress; 1094 + bEndpointAddress = ep->ep.desc->bEndpointAddress; 1095 1095 if ((wIndex ^ bEndpointAddress) & USB_DIR_IN) 1096 1096 continue; 1097 1097 if ((bEndpointAddress & USB_ENDPOINT_NUMBER_MASK) ··· 1727 1727 usb_speed_string(udc->gadget.speed)); 1728 1728 1729 1729 ep0 = &usba_ep[0]; 1730 - ep0->desc = &usba_ep0_desc; 1730 + ep0->ep.desc = &usba_ep0_desc; 1731 1731 ep0->state = WAIT_FOR_SETUP; 1732 1732 usba_ep_writel(ep0, CFG, 1733 1733 (USBA_BF(EPT_SIZE, EP0_EPT_SIZE)
-1
drivers/usb/gadget/atmel_usba_udc.h
··· 280 280 struct usba_udc *udc; 281 281 282 282 struct list_head queue; 283 - const struct usb_endpoint_descriptor *desc; 284 283 285 284 u16 fifo_size; 286 285 u8 nr_banks;