X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fs390%2Fcio%2Fdevice_ops.c;h=6c617ddc13ca4d7138e1f60028d290d0f5d76ae6;hb=3e3ff47c8527c5ba0be4e9f358d49e4b076bd6ef;hp=07a3d2258e760a18bdf72371663449f244eeabb2;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 07a3d2258..6c617ddc1 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/device_ops.c
  *
- *   $Revision: 1.50 $
+ *   $Revision: 1.47 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *			 IBM Corporation
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/device.h>
-#include <linux/delay.h>
 
 #include <asm/ccwdev.h>
 #include <asm/idals.h>
@@ -269,7 +268,7 @@ __ccw_device_retry_loop(struct ccw_device *cdev, struct ccw1 *ccw, long magic)
 		if ((ret == -EBUSY) || (ret == -EACCES)) {
 			/* Try again later. */
 			spin_unlock_irq(&sch->lock);
-			msleep(10);
+			schedule_timeout(1);
 			spin_lock_irq(&sch->lock);
 			continue;
 		}
@@ -295,7 +294,7 @@ __ccw_device_retry_loop(struct ccw_device *cdev, struct ccw1 *ccw, long magic)
 			break;
 		/* Try again later. */
 		spin_unlock_irq(&sch->lock);
-		msleep(10);
+		schedule_timeout(1);
 		spin_lock_irq(&sch->lock);
 	} while (1);