8 files changed, 13 insertions, 24 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 418b1469d75d..28f2c177a541 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1713,10 +1713,9 @@ static unsigned long pollcomplete(int ctlr)
 
         for (i = 20 * HZ; i > 0; i--) {
                 done = hba[ctlr]->access.command_completed(hba[ctlr]);
-                if (done == FIFO_EMPTY) {
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(1);
-                } else
+                if (done == FIFO_EMPTY)
+                        schedule_timeout_uninterruptible(1);
+                else
                         return (done);
         }
         /* Invalid address to tell caller we ran out of time */
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 7289f67e9568..ac5ba462710b 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -516,8 +516,7 @@ static int pcd_tray_move(struct cdrom_device_info *cdi, int position)
 
 static void pcd_sleep(int cs)
 {
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(cs);
+        schedule_timeout_interruptible(cs);
 }
 
 static int pcd_reset(struct pcd_unit *cd)
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 060b1f2a91dd..711d2f314ac3 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -507,8 +507,7 @@ static void pf_eject(struct pf_unit *pf)
 
 static void pf_sleep(int cs)
 {
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(cs);
+        schedule_timeout_interruptible(cs);
 }
 
 /* the ATAPI standard actually specifies the contents of all 7 registers
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 84d8e291ed96..b3982395f22b 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -276,8 +276,7 @@ static inline u8 DRIVE(struct pg *dev)
 
 static void pg_sleep(int cs)
 {
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(cs);
+        schedule_timeout_interruptible(cs);
 }
 
 static int pg_wait(struct pg *dev, int go, int stop, unsigned long tmo, char *msg)
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 5fe8ee86f095..d8d35233cf49 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -383,8 +383,7 @@ static int pt_atapi(struct pt_unit *tape, char *cmd, int dlen, char *buf, char *
 
 static void pt_sleep(int cs)
 {
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(cs);
+        schedule_timeout_interruptible(cs);
 }
 
 static int pt_poll_dsc(struct pt_unit *tape, int pause, int tmo, char *msg)
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index e5f7494c00ee..e425ad3eebba 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -834,8 +834,7 @@ static int fd_eject(struct floppy_state *fs)
                         break;
                 }
                 swim3_select(fs, RELAX);
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(1);
+                schedule_timeout_interruptible(1);
                 if (swim3_readbit(fs, DISK_IN) == 0)
                         break;
         }
@@ -906,8 +905,7 @@ static int floppy_open(struct inode *inode, struct file *filp)
                                 break;
                         }
                         swim3_select(fs, RELAX);
-                        current->state = TASK_INTERRUPTIBLE;
-                        schedule_timeout(1);
+                        schedule_timeout_interruptible(1);
                 }
                 if (err == 0 && (swim3_readbit(fs, SEEK_COMPLETE) == 0
                                  || swim3_readbit(fs, DISK_IN) == 0))
@@ -992,8 +990,7 @@ static int floppy_revalidate(struct gendisk *disk)
                 if (signal_pending(current))
                         break;
                 swim3_select(fs, RELAX);
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(1);
+                schedule_timeout_interruptible(1);
         }
         ret = swim3_readbit(fs, SEEK_COMPLETE) == 0
                 || swim3_readbit(fs, DISK_IN) == 0;
diff --git a/drivers/block/swim_iop.c b/drivers/block/swim_iop.c
index a1283f6dc018..89e3c2f8b776 100644
--- a/drivers/block/swim_iop.c
+++ b/drivers/block/swim_iop.c
@@ -338,8 +338,7 @@ static int swimiop_eject(struct floppy_state *fs)
                         err = -EINTR;
                         break;
                 }
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(1);
+                schedule_timeout_interruptible(1);
         }
         release_drive(fs);
         return cmd->error;
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 2c6d3423496b..68b6d7b154cf 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -530,10 +530,8 @@ static inline u_char xd_waitport (u_short port,u_char flags,u_char mask,u_long t
         int success;
 
         xdc_busy = 1;
-        while ((success = ((inb(port) & mask) != flags)) && time_before(jiffies, expiry)) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
-        }
+        while ((success = ((inb(port) & mask) != flags)) && time_before(jiffies, expiry))
+                schedule_timeout_uninterruptible(1);
         xdc_busy = 0;
         return (success);
 }