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

Commit 6ddcabc2 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: make use of new usb_endpoint_maxp_mult() 



We have introduced a helper to calculate multiplier
value from wMaxPacketSize. Start using it.

Cc: Bin Liu <b-liu@ti.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 131e19b9

drivers/usb/musb/musb_gadget.c

+4 −4
Original line number Diff line number Diff line
@@ -974,8 +974,8 @@ static int musb_gadget_enable(struct usb_ep *ep, 
		goto fail;



	/* REVISIT this rules out high bandwidth periodic transfers */

	tmp = usb_endpoint_maxp(desc);

	if (tmp & ~0x07ff) {

	tmp = usb_endpoint_maxp_mult(desc) - 1;

	if (tmp) {

		int ok;



		if (usb_endpoint_dir_in(desc))
@@ -987,12 +987,12 @@ static int musb_gadget_enable(struct usb_ep *ep, 
			musb_dbg(musb, "no support for high bandwidth ISO");

			goto fail;

		}

		musb_ep->hb_mult = (tmp >> 11) & 3;

		musb_ep->hb_mult = tmp;

	} else {

		musb_ep->hb_mult = 0;

	}



	musb_ep->packet_sz = tmp & 0x7ff;

	musb_ep->packet_sz = usb_endpoint_maxp(desc);

	tmp = musb_ep->packet_sz * (musb_ep->hb_mult + 1);



	/* enable the interrupts for the endpoint, set the endpoint

drivers/usb/musb/musb_host.c

+1 −1
Original line number Diff line number Diff line
@@ -2237,7 +2237,7 @@ static int musb_urb_enqueue( 
	 * Some musb cores don't support high bandwidth ISO transfers; and

	 * we don't (yet!) support high bandwidth interrupt transfers.

	 */

	qh->hb_mult = 1 + ((qh->maxpacket >> 11) & 0x03);

	qh->hb_mult = usb_endpoint_maxp_mult(epd);

	if (qh->hb_mult > 1) {

		int ok = (qh->type == USB_ENDPOINT_XFER_ISOC);