usb: misc: usbtest: format max packet size for iso transfer

The current code prints all wMaxPacketSize content at endpoint
descriptor, if there is a high speed, high bandwidth endpoint,
it may confuse the users, eg, if there are 3 transactions during
microframe, it will print "wMaxPacket 1400" for packet content.
This commit splits wMaxpacketSize and transaction numbers for
output messages.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 0bbafe795a72..9517812a50e2 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1925,10 +1925,11 @@ test_iso_queue(struct usbtest_dev *dev, struct usbtest_param *param,
         memset(urbs, 0, sizeof(urbs));
         udev = testdev_to_usbdev(dev);
         dev_info(&dev->intf->dev,
-                "... iso period %d %sframes, wMaxPacket %04x\n",
+                "iso period %d %sframes, wMaxPacket %d, transactions: %d\n",
                 1 << (desc->bInterval - 1),
                 (udev->speed == USB_SPEED_HIGH) ? "micro" : "",
-                usb_endpoint_maxp(desc));
+                usb_endpoint_maxp(desc) & 0x7ff,
+                1 + (0x3 & (usb_endpoint_maxp(desc) >> 11)));
 
         for (i = 0; i < param->sglen; i++) {
                 urbs[i] = iso_alloc_urb(udev, pipe, desc,
@@ -1942,7 +1943,7 @@ test_iso_queue(struct usbtest_dev *dev, struct usbtest_param *param,
         }
         packets *= param->iterations;
         dev_info(&dev->intf->dev,
-                "... total %lu msec (%lu packets)\n",
+                "total %lu msec (%lu packets)\n",
                 (packets * (1 << (desc->bInterval - 1)))
                         / ((udev->speed == USB_SPEED_HIGH) ? 8 : 1),
                 packets);