scsi/mesh: replace schedule_timeout() with msleep()

PATCH New [email protected] 1 participant 1 message Sep 1, 2004 SCSI

lore

Share & tools

lore

[email protected]

author

2004-09-01 19:54 UTC #0 lore raw

PATCH 1/7 scsi/mesh: replace schedule_timeout() with msleep()

I would appreciate any comments from the janitor@sternweltens list.

Description: Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time.

Signed-off-by Nishanth Aravamudan <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.9-rc1-bk7-max/drivers/scsi/mesh.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

drivers/scsi/mesh.c renamed from drivers/scsi/mesh.c~msleep-drivers_scsi_mesh +4 -8

diff -puN drivers/scsi/mesh.c~msleep-drivers_scsi_mesh drivers/scsi/mesh.c
@@ -388,8 +388,7 @@ static void mesh_init(struct mesh_state 
 		mesh_flush_io(mr);
 
 		/* Wait for bus to come back */
-		current->state = TASK_UNINTERRUPTIBLE;
-		schedule_timeout((init_reset_delay * HZ) / 1000);
+		msleep(init_reset_delay);
 	}
 	
 	/* Reconfigure controller */

@@ -1749,12 +1748,10 @@ static void set_mesh_power(struct mesh_s
 		return;
 	if (state) {
 		pmac_call_feature(PMAC_FTR_MESH_ENABLE, macio_get_of_node(ms->mdev), 0, 1);
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(HZ/5);
+		msleep(200);
 	} else {
 		pmac_call_feature(PMAC_FTR_MESH_ENABLE, macio_get_of_node(ms->mdev), 0, 0);
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(HZ/100);
+		msleep(10);
 	}
 }

@@ -1772,8 +1769,7 @@ static int mesh_suspend(struct macio_dev
 	spin_lock_irqsave(ms->host->host_lock, flags);
 	while(ms->phase != idle) {
 		spin_unlock_irqrestore(ms->host->host_lock, flags);
-		current->state = TASK_UNINTERRUPTIBLE;
-		schedule_timeout(HZ/100);
+		msleep(10);
 		spin_lock_irqsave(ms->host->host_lock, flags);
 	}
 	ms->phase = sleeping;