Hi,
this makes the core use the new safe waiting helper.
Please apply.
Regards
Oliver
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2004-05-17 23:14:47+02:00, [EMAIL PROTECTED]
- remove wait_ms from hub driver
hub.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff -Nru a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
--- a/drivers/usb/core/hub.c Mon May 17 23:15:43 2004
+++ b/drivers/usb/core/hub.c Mon May 17 23:15:43 2004
@@ -381,7 +381,7 @@
}
/* Wait for power to be enabled */
- wait_ms(hub->descriptor->bPwrOn2PwrGood * 2);
+ usb_uninterruptible_sleep_ms(hub->descriptor->bPwrOn2PwrGood * 2);
}
static int hub_hub_status(struct usb_hub *hub,
@@ -887,7 +887,7 @@
delay_time < HUB_RESET_TIMEOUT;
delay_time += delay) {
/* wait to give the device a chance to reset */
- wait_ms(delay);
+ usb_uninterruptible_sleep_ms(delay);
/* read and decode port status */
ret = hub_port_status(hub, port, &portstatus, &portchange);
@@ -1002,7 +1002,7 @@
connection = 0;
stable_count = 0;
for (delay_time = 0; delay_time < HUB_DEBOUNCE_TIMEOUT; delay_time +=
HUB_DEBOUNCE_STEP) {
- wait_ms(HUB_DEBOUNCE_STEP);
+ usb_uninterruptible_sleep_ms(HUB_DEBOUNCE_STEP);
ret = hub_port_status(hub, port, &portstatus, &portchange);
if (ret < 0)
@@ -1146,7 +1146,7 @@
retval = usb_set_address(dev);
if (retval >= 0)
break;
- wait_ms(200);
+ usb_uninterruptible_sleep_ms(200);
}
if (retval < 0) {
dev_err(&dev->dev,
@@ -1165,11 +1165,11 @@
* - let SET_ADDRESS settle, some device hardware wants it
* - read ep0 maxpacket even for high and low speed,
*/
- wait_ms(10);
+ usb_uninterruptible_sleep_ms(10);
retval = usb_get_device_descriptor(dev, 8);
if (retval >= 8)
break;
- wait_ms(100);
+ usb_uninterruptible_sleep_ms(100);
}
if (retval != 8) {
dev_err(&dev->dev, "device descriptor read/%s, error %d\n",
@@ -1515,7 +1515,7 @@
}
if (hubchange & HUB_CHANGE_OVERCURRENT) {
dev_dbg (&hub->intf->dev, "overcurrent change\n");
- wait_ms(500); /* Cool down */
+ usb_uninterruptible_sleep_ms(500); /* Cool down */
clear_hub_feature(dev, C_HUB_OVER_CURRENT);
hub_power_on(hub);
}
===================================================================
This BitKeeper patch contains the following changesets:
1.1726
## Wrapped with gzip_uu ##
M'XL( '\KJ4 \5476^;,!1]QK_B2GW96@&V,1]A2M4UB=IITQJUS=,T10;<
M@ 8X,I"H$C]^#J[:55V'5DT:( ["[EMAIL PROTECTED]&S)LM@)[EMAIL PROTECTED];%4\
M342;.[7H?G25(]5&#UU+J8?<7%;"-?7NK1*B<<NB[AKJ(UVSY&V:@QYJ8HLX
MWN.;]GXK8NMZ<;'Z\O$:H>D49CFO-^)&M#"=HE:J'2^SYHRW>2EKIU6\;BK1
M<B>55?]8VE.,J3Y]$GK8#WH28!;V*<D(X8R(#%,6!0P9<V<O%_%<[EMAIL PROTECTED]
M0>^QR"-H#L31KP+ S,[EMAIL PROTECTED],(33&.,X55E."[EMAIL PROTECTED],Y2"#4I4
M<[EMAIL PROTECTED]>9= IH9-^PP>F] (+9]ZBNR_/!#"'*/3$?MFPL;MFL35
M!ISTEV4P3,*>A2SP>W&73"AE..&"IW?9ZUU[)IA*)9Y4S>80PACI28C#8 C-
M[^O'$_0VXRCCNR*SD[/MP7E9:[EMAIL PROTECTED]>JP?HB%5D^A%ILAX
MID*PP_^5*=/T*[#5?KAT1I:O]/\-:9M[$0."/AFPM-ZZJXNZ%4IUV[9(2K%N
M2B&VVML[/8=]FHDF5<56M\(^399[=553?;^0,H-CH.\_H'DTP0=% ]:?)3-1
M\OL#B6#L'U@/.$*[7)VOYXOSJ]77V6)]<[M8#A*$308)@]:(AMXDPPHBPQIP
MA$0>."$UG %'.8;D$S.106O,[EMAIL PROTECTED]>XQS*0L(9/[&H[=IU][FHOT1]-5TTA_
.,JGO,_03O[=--4,&
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
