usb/message: make usb_{control,bulk}_msg() use msecs

PATCH In review Nishanth Aravamudan 2 participants 3 messages Feb 9, 2005 – Feb 15, 2005

Subsystems (2)

USB Bluetooth drivers

lore

Share & tools

lore

Nishanth Aravamudan

author

2005-02-09 00:12 UTC #0 lore raw

PATCH 1/63 usb/message: make usb_{control,bulk}_msg() use msecs

Hi,

Sent to everyone so that build and compile tests will be possible. Only Greg should need to pull this into a tree, though, to send upstream.

Thanks,
Nish

Description: Change the units of the timeout parameter in both usb_control_msg() and usb_bulk_msg() from jiffies to milliseconds. This is the core patch upon which the remaining ones will be built. Patch is compile-tested.

Signed-off-by Nishanth Aravamudan <[email protected]>

drivers/usb/core/message.c +4 -4

@@ -98,7 +98,7 @@ int usb_internal_control_msg(struct usb_
 	usb_fill_control_urb(urb, usb_dev, pipe, (unsigned char *)cmd, data,
 			     len, usb_api_blocking_completion, NULL);
 
-	retv = usb_start_wait_urb(urb, timeout, &length);
+	retv = usb_start_wait_urb(urb, msecs_to_jiffies(timeout), &length);
 	if (retv < 0)
 		return retv;
 	else

@@ -115,7 +115,7 @@ int usb_internal_control_msg(struct usb_
  *	@index: USB message index value
  *	@data: pointer to the data to send
  *	@size: length in bytes of the data to send
- *	@timeout: time in jiffies to wait for the message to complete before
+ *	@timeout: time in msecs to wait for the message to complete before
  *		timing out (if 0 the wait is forever)
  *	Context: !in_interrupt ()
  *

@@ -163,7 +163,7 @@ int usb_control_msg(struct usb_device *d
  *	@data: pointer to the data to send
  *	@len: length in bytes of the data to send
  *	@actual_length: pointer to a location to put the actual length transferred in bytes
- *	@timeout: time in jiffies to wait for the message to complete before
+ *	@timeout: time in msecs to wait for the message to complete before
  *		timing out (if 0 the wait is forever)
  *	Context: !in_interrupt ()
  *

@@ -196,7 +196,7 @@ int usb_bulk_msg(struct usb_device *usb_
 	usb_fill_bulk_urb(urb, usb_dev, pipe, data, len,
 			  usb_api_blocking_completion, NULL);
 
-	return usb_start_wait_urb(urb,timeout,actual_length);
+	return usb_start_wait_urb(urb,msecs_to_jiffies(timeout),actual_length);
 }
 
 /*-------------------------------------------------------------------*/

Greg KH

2005-02-15 22:29 UTC #1 lore raw

Quoted 4 lines · Nishanth Aravamudan

Hi,
Sent to everyone so that build and compile tests will be possible. Only Greg should need to pull this into a tree, though, to send upstream.

Ugh, 63+ patches...

Anyway, I've applied all of these, and your additional one, to my tree. If you could make sure and check the next -mm release to make sure I got them all, I'd appreciate it.

thanks a lot for your work, I appreciate it.

greg k-h

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Nishanth Aravamudan

author

2005-02-15 23:10 UTC #2 lore raw

Quoted 6 lines · Greg KH

Quoted 4 lines · Nishanth Aravamudan
Hi,
Sent to everyone so that build and compile tests will be possible. Only Greg should need to pull this into a tree, though, to send upstream.

Quoted 7 lines

Ugh, 63+ patches...
Anyway, I've applied all of these, and your additional one, to my tree. If you could make sure and check the next -mm release to make sure I got them all, I'd appreciate it.
thanks a lot for your work, I appreciate it.

No problem! I will keep my eye on the USB tree in the next -MM and make sure there aren't any stray unchanged usb_{bulk,control}_msg()s around. Thanks for your help!

-Nish