Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/usb/chipidea/udc.c

+5 −9
Original line number Diff line number Diff line
@@ -986,6 +986,7 @@ static int ep_enable(struct usb_ep *ep, 
	struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);

	int retval = 0;

	unsigned long flags;

	u32 cap = 0;



	if (ep == NULL || desc == NULL)

		return -EINVAL;
@@ -1005,17 +1006,12 @@ static int ep_enable(struct usb_ep *ep, 


	mEp->ep.maxpacket = usb_endpoint_maxp(desc);



	mEp->qh.ptr->cap = 0;



	if (mEp->type == USB_ENDPOINT_XFER_CONTROL)

		mEp->qh.ptr->cap |=  cpu_to_le32(QH_IOS);

	else if (mEp->type == USB_ENDPOINT_XFER_ISOC)

		mEp->qh.ptr->cap &= cpu_to_le32(~QH_MULT);

	else

		mEp->qh.ptr->cap &= cpu_to_le32(~QH_ZLT);

		cap |= QH_IOS;

	cap |= (mEp->ep.maxpacket << __ffs(QH_MAX_PKT)) & QH_MAX_PKT;



	mEp->qh.ptr->cap = cpu_to_le32(cap);



	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? */



	/*