AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Remove redundant pointer to struct usb_endpoint_descriptor.

Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Ido Shayevitz 2012-03-12 20:25:39 +02:00 committed by Felipe Balbi
parent fa42e52ba4
commit 0ff21e0e9c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/gadget/pch_udc.c
View File

@ -295,7 +295,6 @@ struct pch_udc_ep {
struct pch_udc_data_dma_desc *td_data; struct pch_udc_data_dma_desc *td_data;
struct pch_udc_dev *dev; struct pch_udc_dev *dev;
unsigned long offset_addr; unsigned long offset_addr;
const struct usb_endpoint_descriptor *desc;
struct list_head queue; struct list_head queue;
unsigned num:5, unsigned num:5,
in:1, in:1,
@ -1705,7 +1704,7 @@ static int pch_udc_pcd_ep_enable(struct usb_ep *usbep,
if (!dev->driver || (dev->gadget.speed == USB_SPEED_UNKNOWN)) if (!dev->driver || (dev->gadget.speed == USB_SPEED_UNKNOWN))
return -ESHUTDOWN; return -ESHUTDOWN;
spin_lock_irqsave(&dev->lock, iflags); spin_lock_irqsave(&dev->lock, iflags);
ep->desc = desc; ep->ep.desc = desc;
ep->halted = 0; ep->halted = 0;
pch_udc_ep_enable(ep, &ep->dev->cfg_data, desc); pch_udc_ep_enable(ep, &ep->dev->cfg_data, desc);
ep->ep.maxpacket = usb_endpoint_maxp(desc); ep->ep.maxpacket = usb_endpoint_maxp(desc);
@ -1734,7 +1733,7 @@ static int pch_udc_pcd_ep_disable(struct usb_ep *usbep)
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev; dev = ep->dev;
if ((usbep->name == ep0_string) || !ep->desc) if ((usbep->name == ep0_string) || !ep->ep.desc)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&ep->dev->lock, iflags); spin_lock_irqsave(&ep->dev->lock, iflags);
@ -1742,7 +1741,6 @@ static int pch_udc_pcd_ep_disable(struct usb_ep *usbep)
ep->halted = 1; ep->halted = 1;
pch_udc_ep_disable(ep); pch_udc_ep_disable(ep);
pch_udc_disable_ep_interrupts(ep->dev, PCH_UDC_EPINT(ep->in, ep->num)); pch_udc_disable_ep_interrupts(ep->dev, PCH_UDC_EPINT(ep->in, ep->num));
ep->desc = NULL;
ep->ep.desc = NULL; ep->ep.desc = NULL;
INIT_LIST_HEAD(&ep->queue); INIT_LIST_HEAD(&ep->queue);
spin_unlock_irqrestore(&ep->dev->lock, iflags); spin_unlock_irqrestore(&ep->dev->lock, iflags);
@ -1849,7 +1847,7 @@ static int pch_udc_pcd_queue(struct usb_ep *usbep, struct usb_request *usbreq,
return -EINVAL; return -EINVAL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev; dev = ep->dev;
if (!ep->desc && ep->num) if (!ep->ep.desc && ep->num)
return -EINVAL; return -EINVAL;
req = container_of(usbreq, struct pch_udc_request, req); req = container_of(usbreq, struct pch_udc_request, req);
if (!list_empty(&req->queue)) if (!list_empty(&req->queue))
@ -1949,7 +1947,7 @@ static int pch_udc_pcd_dequeue(struct usb_ep *usbep,
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev; dev = ep->dev;
if (!usbep || !usbreq || (!ep->desc && ep->num)) if (!usbep || !usbreq || (!ep->ep.desc && ep->num))
return ret; return ret;
req = container_of(usbreq, struct pch_udc_request, req); req = container_of(usbreq, struct pch_udc_request, req);
spin_lock_irqsave(&ep->dev->lock, flags); spin_lock_irqsave(&ep->dev->lock, flags);
@ -1988,7 +1986,7 @@ static int pch_udc_pcd_set_halt(struct usb_ep *usbep, int halt)
return -EINVAL; return -EINVAL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev; dev = ep->dev;
if (!ep->desc && !ep->num) if (!ep->ep.desc && !ep->num)
return -EINVAL; return -EINVAL;
if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN)) if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN))
return -ESHUTDOWN; return -ESHUTDOWN;
@ -2033,7 +2031,7 @@ static int pch_udc_pcd_set_wedge(struct usb_ep *usbep)
return -EINVAL; return -EINVAL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev; dev = ep->dev;
if (!ep->desc && !ep->num) if (!ep->ep.desc && !ep->num)
return -EINVAL; return -EINVAL;
if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN)) if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN))
return -ESHUTDOWN; return -ESHUTDOWN;
@ -2065,7 +2063,7 @@ static void pch_udc_pcd_fifo_flush(struct usb_ep *usbep)
return; return;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
if (ep->desc || !ep->num) if (ep->ep.desc || !ep->num)
pch_udc_ep_fifo_flush(ep, ep->in); pch_udc_ep_fifo_flush(ep, ep->in);
} }