1 files changed, 6 insertions, 11 deletions

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 2414e6493aa5..e5cdb5bfabc8 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -800,8 +800,7 @@ static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
          * doesn't seem to have as many firmware restart cycles...
          *
          * As a test, we're sticking in a 1/100s delay here */
-        set_current_state(TASK_UNINTERRUPTIBLE);
-        schedule_timeout(HZ / 100);
+        schedule_timeout_uninterruptible(msecs_to_jiffies(10));
 
         return 0;
 
@@ -1256,8 +1255,7 @@ static int ipw2100_start_adapter(struct ipw2100_priv *priv)
         IPW_DEBUG_FW("Waiting for f/w initialization to complete...\n");
         i = 5000;
         do {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(40 * HZ / 1000);
+                schedule_timeout_uninterruptible(msecs_to_jiffies(40));
                 /* Todo... wait for sync command ... */
 
                 read_register(priv->net_dev, IPW_REG_INTA, &inta);
@@ -1411,8 +1409,7 @@ static int ipw2100_hw_phy_off(struct ipw2100_priv *priv)
                     (val2 & IPW2100_COMMAND_PHY_OFF))
                         return 0;
 
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(HW_PHY_OFF_LOOP_DELAY);
+                schedule_timeout_uninterruptible(HW_PHY_OFF_LOOP_DELAY);
         }
 
         return -EIO;
@@ -1466,7 +1463,7 @@ fail_up:
 
 static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
 {
-#define HW_POWER_DOWN_DELAY (HZ / 10)
+#define HW_POWER_DOWN_DELAY (msecs_to_jiffies(100))
 
         struct host_command cmd = {
                 .host_command = HOST_PRE_POWER_DOWN,
@@ -1520,10 +1517,8 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
                         printk(KERN_WARNING DRV_NAME ": "
                                "%s: Power down command failed: Error %d\n",
                                priv->net_dev->name, err);
-                else {
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(HW_POWER_DOWN_DELAY);
-                }
+                else
+                        schedule_timeout_uninterruptible(HW_POWER_DOWN_DELAY);
         }
 
         priv->status &= ~STATUS_ENABLED;