diff options
| author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-03-07 08:06:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-03-07 08:06:51 -0800 |
| commit | dff8eaaf176d48384c13e41b6aa156d3be3af6ba (patch) | |
| tree | 4812e62d574940bcdc2299e735f43fb0ae0b8386 /drivers/usb/misc | |
| parent | a02f81e2b7709ca9edd761f8cb5f891b7debe797 (diff) | |
| download | history-dff8eaaf176d48384c13e41b6aa156d3be3af6ba.tar.gz history-dff8eaaf176d48384c13e41b6aa156d3be3af6ba.zip | |
[PATCH] usb/usbtest: change parameters of usb_{control,bulk}_msg() to msecs
Change units of parameters being passed to usb_{control,bulk}_msg() to
milliseconds. USB_CTRL_{GET,SET}_TIMEOUT were converted to milliseconds
in a separate patch. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
| -rw-r--r-- | drivers/usb/misc/usbtest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 38eb2993fc..0928ffc990 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c @@ -472,7 +472,7 @@ static int get_altsetting (struct usbtest_dev *dev) retval = usb_control_msg (udev, usb_rcvctrlpipe (udev, 0), USB_REQ_GET_INTERFACE, USB_DIR_IN|USB_RECIP_INTERFACE, 0, iface->altsetting [0].desc.bInterfaceNumber, - dev->buf, 1, HZ * USB_CTRL_GET_TIMEOUT); + dev->buf, 1, USB_CTRL_GET_TIMEOUT); switch (retval) { case 1: return dev->buf [0]; @@ -602,7 +602,7 @@ static int ch9_postconfig (struct usbtest_dev *dev) retval = usb_control_msg (udev, usb_rcvctrlpipe (udev, 0), USB_REQ_GET_CONFIGURATION, USB_DIR_IN | USB_RECIP_DEVICE, - 0, 0, dev->buf, 1, HZ * USB_CTRL_GET_TIMEOUT); + 0, 0, dev->buf, 1, USB_CTRL_GET_TIMEOUT); if (retval != 1 || dev->buf [0] != expected) { dev_dbg (&iface->dev, "get config --> %d (%d)\n", retval, @@ -1173,7 +1173,7 @@ static int test_halt (int ep, struct urb *urb) retval = usb_control_msg (urb->dev, usb_sndctrlpipe (urb->dev, 0), USB_REQ_SET_FEATURE, USB_RECIP_ENDPOINT, USB_ENDPOINT_HALT, ep, - NULL, 0, HZ * USB_CTRL_SET_TIMEOUT); + NULL, 0, USB_CTRL_SET_TIMEOUT); if (retval < 0) { dbg ("ep %02x couldn't set halt, %d", ep, retval); return retval; @@ -1263,7 +1263,7 @@ static int ctrl_out (struct usbtest_dev *dev, buf [j] = i + j; retval = usb_control_msg (udev, usb_sndctrlpipe (udev,0), 0x5b, USB_DIR_OUT|USB_TYPE_VENDOR, - 0, 0, buf, len, HZ * USB_CTRL_SET_TIMEOUT); + 0, 0, buf, len, USB_CTRL_SET_TIMEOUT); if (retval != len) { what = "write"; break; @@ -1272,7 +1272,7 @@ static int ctrl_out (struct usbtest_dev *dev, /* read it back -- assuming nothing intervened!! */ retval = usb_control_msg (udev, usb_rcvctrlpipe (udev,0), 0x5c, USB_DIR_IN|USB_TYPE_VENDOR, - 0, 0, buf, len, HZ * USB_CTRL_GET_TIMEOUT); + 0, 0, buf, len, USB_CTRL_GET_TIMEOUT); if (retval != len) { what = "read"; break; |