Commit 1cd12a9c authored by Michael Grzeschik's avatar Michael Grzeschik Committed by Greg Kroah-Hartman

usb: chipidea: udc: rework ep_enable cap setting

This patch reworks the cap value from several read
and write operations to one single operation.
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
[Alex: removed useless isoc-related bit of code]
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 080ff5f4
...@@ -986,6 +986,7 @@ static int ep_enable(struct usb_ep *ep, ...@@ -986,6 +986,7 @@ static int ep_enable(struct usb_ep *ep,
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep); struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
int retval = 0; int retval = 0;
unsigned long flags; unsigned long flags;
u32 cap = 0;
if (ep == NULL || desc == NULL) if (ep == NULL || desc == NULL)
return -EINVAL; return -EINVAL;
...@@ -1005,17 +1006,12 @@ static int ep_enable(struct usb_ep *ep, ...@@ -1005,17 +1006,12 @@ static int ep_enable(struct usb_ep *ep,
mEp->ep.maxpacket = usb_endpoint_maxp(desc); mEp->ep.maxpacket = usb_endpoint_maxp(desc);
mEp->qh.ptr->cap = 0;
if (mEp->type == USB_ENDPOINT_XFER_CONTROL) if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
mEp->qh.ptr->cap |= cpu_to_le32(QH_IOS); cap |= QH_IOS;
else if (mEp->type == USB_ENDPOINT_XFER_ISOC) cap |= (mEp->ep.maxpacket << __ffs(QH_MAX_PKT)) & QH_MAX_PKT;
mEp->qh.ptr->cap &= cpu_to_le32(~QH_MULT);
else mEp->qh.ptr->cap = cpu_to_le32(cap);
mEp->qh.ptr->cap &= cpu_to_le32(~QH_ZLT);
mEp->qh.ptr->cap |= cpu_to_le32((mEp->ep.maxpacket << __ffs(QH_MAX_PKT))
& QH_MAX_PKT);
mEp->qh.ptr->td.next |= cpu_to_le32(TD_TERMINATE); /* needed? */ mEp->qh.ptr->td.next |= cpu_to_le32(TD_TERMINATE); /* needed? */
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment