diff options
author | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-09-28 06:40:03 -0400 |
---|---|---|
committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-11-03 04:38:21 -0400 |
commit | 131e19b9e3a5a463ab790db737c72040a918967c (patch) | |
tree | 4c67c5d9d9509076883db9569d8f2404a6da11cf /drivers/usb/misc/usbtest.c | |
parent | dcf5228c1c78c217eedade8455e20af32d359e00 (diff) |
usb: misc: usbtest: make use of new usb_endpoint_maxp_mult()
We have introduced a helper to calculate multiplier
value from wMaxPacketSize. Start using it.
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/misc/usbtest.c')
-rw-r--r-- | drivers/usb/misc/usbtest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 5c8210dc6fd9..8edfbc8bf345 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
@@ -1915,7 +1915,7 @@ static struct urb *iso_alloc_urb( | |||
1915 | if (bytes < 0 || !desc) | 1915 | if (bytes < 0 || !desc) |
1916 | return NULL; | 1916 | return NULL; |
1917 | maxp = 0x7ff & usb_endpoint_maxp(desc); | 1917 | maxp = 0x7ff & usb_endpoint_maxp(desc); |
1918 | maxp *= 1 + (0x3 & (usb_endpoint_maxp(desc) >> 11)); | 1918 | maxp *= usb_endpoint_maxp_mult(desc); |
1919 | packets = DIV_ROUND_UP(bytes, maxp); | 1919 | packets = DIV_ROUND_UP(bytes, maxp); |
1920 | 1920 | ||
1921 | urb = usb_alloc_urb(packets, GFP_KERNEL); | 1921 | urb = usb_alloc_urb(packets, GFP_KERNEL); |
@@ -2002,7 +2002,7 @@ test_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param, | |||
2002 | 1 << (desc->bInterval - 1), | 2002 | 1 << (desc->bInterval - 1), |
2003 | (udev->speed == USB_SPEED_HIGH) ? "micro" : "", | 2003 | (udev->speed == USB_SPEED_HIGH) ? "micro" : "", |
2004 | usb_endpoint_maxp(desc) & 0x7ff, | 2004 | usb_endpoint_maxp(desc) & 0x7ff, |
2005 | 1 + (0x3 & (usb_endpoint_maxp(desc) >> 11))); | 2005 | usb_endpoint_maxp_mult(desc)); |
2006 | 2006 | ||
2007 | dev_info(&dev->intf->dev, | 2007 | dev_info(&dev->intf->dev, |
2008 | "total %lu msec (%lu packets)\n", | 2008 | "total %lu msec (%lu packets)\n", |