| From 64be689600684985c8c2569f2486fc6a65fe49db Mon Sep 17 00:00:00 2001 |
| From: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Date: Wed, 28 Sep 2016 13:39:22 +0300 |
| Subject: [PATCH 272/299] usb: host: xhci: make use of new |
| usb_endpoint_maxp_mult() |
| |
| We have introduced a helper to calculate multiplier |
| value from wMaxPacketSize. Start using it. |
| |
| Cc: Mathias Nyman <mathias.nyman@intel.com> |
| Cc: <linux-usb@vger.kernel.org> |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| (cherry picked from commit dcf5228c1c78c217eedade8455e20af32d359e00) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-mem.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-mem.c |
| +++ b/drivers/usb/host/xhci-mem.c |
| @@ -1421,7 +1421,7 @@ static u32 xhci_get_endpoint_max_burst(s |
| if (udev->speed == USB_SPEED_HIGH && |
| (usb_endpoint_xfer_isoc(&ep->desc) || |
| usb_endpoint_xfer_int(&ep->desc))) |
| - return (usb_endpoint_maxp(&ep->desc) & 0x1800) >> 11; |
| + return usb_endpoint_maxp_mult(&ep->desc) - 1; |
| |
| return 0; |
| } |
| @@ -1467,9 +1467,9 @@ static u32 xhci_get_max_esit_payload(str |
| return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); |
| |
| max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)); |
| - max_burst = (usb_endpoint_maxp(&ep->desc) & 0x1800) >> 11; |
| + max_burst = usb_endpoint_maxp_mult(&ep->desc); |
| /* A 0 in max burst means 1 transfer per ESIT */ |
| - return max_packet * (max_burst + 1); |
| + return max_packet * max_burst; |
| } |
| |
| /* Set up an endpoint with one ring segment. Do not allocate stream rings. |
