ChangeSet 1.1746, 2004/05/18 15:56:35-07:00, greg@kroah.com

USB: remove usb_uninterruptible_sleep_ms() now that we have msleep()


 drivers/usb/core/hub.c |   14 +++++++-------
 drivers/usb/core/usb.c |   11 -----------
 include/linux/usb.h    |    2 --
 3 files changed, 7 insertions(+), 20 deletions(-)


diff -Nru a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
--- a/drivers/usb/core/hub.c	Tue May 18 17:05:52 2004
+++ b/drivers/usb/core/hub.c	Tue May 18 17:05:52 2004
@@ -381,7 +381,7 @@
 	}
 
 	/* Wait for power to be enabled */
-	usb_uninterruptible_sleep_ms(hub->descriptor->bPwrOn2PwrGood * 2);
+	msleep(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 */
-		usb_uninterruptible_sleep_ms(delay);
+		msleep(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) {
-		usb_uninterruptible_sleep_ms(HUB_DEBOUNCE_STEP);
+		msleep(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;
-			usb_uninterruptible_sleep_ms(200);
+			msleep(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,
   		 */
-		usb_uninterruptible_sleep_ms(10);
+		msleep(10);
 		retval = usb_get_device_descriptor(dev, 8);
 		if (retval >= 8)
 			break;
-		usb_uninterruptible_sleep_ms(100);
+		msleep(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");
-				usb_uninterruptible_sleep_ms(500);	/* Cool down */
+				msleep(500);	/* Cool down */
 				clear_hub_feature(dev, C_HUB_OVER_CURRENT);
                         	hub_power_on(hub);
 			}
diff -Nru a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
--- a/drivers/usb/core/usb.c	Tue May 18 17:05:52 2004
+++ b/drivers/usb/core/usb.c	Tue May 18 17:05:52 2004
@@ -1483,16 +1483,6 @@
 	return 0;
 }
 
-void usb_uninterruptible_sleep_ms(int msecs)
-{
-	long timeout = msecs_to_jiffies(msecs);
-	
-	while(timeout) {
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		timeout = schedule_timeout(timeout);
-	}
-}
-
 struct bus_type usb_bus_type = {
 	.name =		"usb",
 	.match =	usb_device_match,
@@ -1610,7 +1600,6 @@
 EXPORT_SYMBOL(usb_disconnect);
 
 EXPORT_SYMBOL(__usb_get_extra_descriptor);
-EXPORT_SYMBOL(usb_uninterruptible_sleep_ms);
 
 EXPORT_SYMBOL(usb_find_device);
 EXPORT_SYMBOL(usb_get_current_frame_number);
diff -Nru a/include/linux/usb.h b/include/linux/usb.h
--- a/include/linux/usb.h	Tue May 18 17:05:52 2004
+++ b/include/linux/usb.h	Tue May 18 17:05:52 2004
@@ -31,8 +31,6 @@
 		mdelay(ms);
 }
 
-void usb_uninterruptible_sleep_ms(int msecs);
-
 struct usb_device;
 struct usb_driver;