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

usb: gadget: Update amd5536udc 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 ef20a72b 16e78db7

+6 -8
+6 -7
drivers/usb/gadget/amd5536udc.c
··· 333 333 return -ESHUTDOWN; 334 334 335 335 spin_lock_irqsave(&dev->lock, iflags); 336 - ep->desc = desc; 336 + ep->ep.desc = desc; 337 337 338 338 ep->halted = 0; 339 339 ··· 442 442 u32 tmp; 443 443 444 444 VDBG(ep->dev, "ep-%d reset\n", ep->num); 445 - ep->desc = NULL; 446 445 ep->ep.desc = NULL; 447 446 ep->ep.ops = &udc_ep_ops; 448 447 INIT_LIST_HEAD(&ep->queue); ··· 488 489 return -EINVAL; 489 490 490 491 ep = container_of(usbep, struct udc_ep, ep); 491 - if (usbep->name == ep0_string || !ep->desc) 492 + if (usbep->name == ep0_string || !ep->ep.desc) 492 493 return -EINVAL; 493 494 494 495 DBG(ep->dev, "Disable ep-%d\n", ep->num); ··· 1065 1066 return -EINVAL; 1066 1067 1067 1068 ep = container_of(usbep, struct udc_ep, ep); 1068 - if (!ep->desc && (ep->num != 0 && ep->num != UDC_EP0OUT_IX)) 1069 + if (!ep->ep.desc && (ep->num != 0 && ep->num != UDC_EP0OUT_IX)) 1069 1070 return -EINVAL; 1070 1071 1071 1072 VDBG(ep->dev, "udc_queue(): ep%d-in=%d\n", ep->num, ep->in); ··· 1256 1257 unsigned long iflags; 1257 1258 1258 1259 ep = container_of(usbep, struct udc_ep, ep); 1259 - if (!usbep || !usbreq || (!ep->desc && (ep->num != 0 1260 + if (!usbep || !usbreq || (!ep->ep.desc && (ep->num != 0 1260 1261 && ep->num != UDC_EP0OUT_IX))) 1261 1262 return -EINVAL; 1262 1263 ··· 1316 1317 pr_debug("set_halt %s: halt=%d\n", usbep->name, halt); 1317 1318 1318 1319 ep = container_of(usbep, struct udc_ep, ep); 1319 - if (!ep->desc && (ep->num != 0 && ep->num != UDC_EP0OUT_IX)) 1320 + if (!ep->ep.desc && (ep->num != 0 && ep->num != UDC_EP0OUT_IX)) 1320 1321 return -EINVAL; 1321 1322 if (!ep->dev->driver || ep->dev->gadget.speed == USB_SPEED_UNKNOWN) 1322 1323 return -ESHUTDOWN; ··· 1538 1539 * disabling ep interrupts when ENUM interrupt occurs but ep is 1539 1540 * not enabled by gadget driver 1540 1541 */ 1541 - if (!ep->desc) 1542 + if (!ep->ep.desc) 1542 1543 ep_init(dev->regs, ep); 1543 1544 1544 1545 if (use_dma) {
-1
drivers/usb/gadget/amd5536udc.h
··· 512 512 513 513 /* queue for requests */ 514 514 struct list_head queue; 515 - const struct usb_endpoint_descriptor *desc; 516 515 unsigned halted; 517 516 unsigned cancel_transfer; 518 517 unsigned num : 5,