3 files changed, 11 insertions, 20 deletions

diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index ed3c891e388f..014085d8ec85 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -511,7 +511,7 @@ mpt_lan_close(struct net_device *dev)
 {
         struct mpt_lan_priv *priv = netdev_priv(dev);
         MPT_ADAPTER *mpt_dev = priv->mpt_dev;
-        unsigned int timeout;
+        unsigned long timeout;
         int i;
 
         dlprintk((KERN_INFO MYNAM ": mpt_lan_close called\n"));
@@ -526,11 +526,9 @@ mpt_lan_close(struct net_device *dev)
 
         mpt_lan_reset(dev);
 
-        timeout = 2 * HZ;
-        while (atomic_read(&priv->buckets_out) && --timeout) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(1);
-        }
+        timeout = jiffies + 2 * HZ;
+        while (atomic_read(&priv->buckets_out) && time_before(jiffies, timeout))
+                schedule_timeout_interruptible(1);
 
         for (i = 0; i < priv->max_buckets_out; i++) {
                 if (priv->RcvCtl[i].skb != NULL) {
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 5cb07eb224d7..4330ed0cedaa 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1013,10 +1013,8 @@ mptscsih_remove(struct pci_dev *pdev)
         spin_lock_irqsave(&dvtaskQ_lock, flags);
         if (dvtaskQ_active) {
                 spin_unlock_irqrestore(&dvtaskQ_lock, flags);
-                while(dvtaskQ_active && --count) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(1);
-                }
+                while(dvtaskQ_active && --count)
+                        schedule_timeout_interruptible(1);
         } else {
                 spin_unlock_irqrestore(&dvtaskQ_lock, flags);
         }
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 61b837de4b6a..4eb53258842e 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -93,8 +93,7 @@ u32 i2o_msg_get_wait(struct i2o_controller *c,
                                   c->name);
                         return I2O_QUEUE_EMPTY;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         return m;
@@ -485,8 +484,7 @@ static int i2o_iop_init_outbound_queue(struct i2o_controller *c)
                         osm_warn("%s: Timeout Initializing\n", c->name);
                         return -ETIMEDOUT;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         m = c->out_queue.phys;
@@ -548,8 +546,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
                 if (time_after(jiffies, timeout))
                         break;
 
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         switch (*status) {
@@ -577,8 +574,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
                                 rc = -ETIMEDOUT;
                                 goto exit;
                         }
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(1);
+                        schedule_timeout_uninterruptible(1);
 
                         m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_RESET);
                 }
@@ -989,8 +985,7 @@ int i2o_status_get(struct i2o_controller *c)
                         return -ETIMEDOUT;
                 }
 
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
 #ifdef DEBUG