Skip to contentSkip to conversation

wireless/airo: replace schedule_timeout() with msleep()

PATCH In review [email protected] 1 participant 1 message Sep 1, 2004

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 6/8 wireless/airo: 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/net/wireless/airo.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
drivers/net/wireless/airo.c renamed from drivers/net/wireless/airo.c~msleep-drivers_net_wireless_airo +6 -12
diff -puN drivers/net/wireless/airo.c~msleep-drivers_net_wireless_airo drivers/net/wireless/airo.c
@@ -2670,11 +2670,9 @@ int reset_card( struct net_device *dev ,
 		return -1;
 	waitbusy (ai);
 	OUT4500(ai,COMMAND,CMD_SOFTRESET);
-	set_current_state (TASK_UNINTERRUPTIBLE);
-	schedule_timeout (HZ/5);
+	msleep(200);
 	waitbusy (ai);
-	set_current_state (TASK_UNINTERRUPTIBLE);
-	schedule_timeout (HZ/5);
+	msleep(200);
 	if (lock)
 		up(&ai->sem);
 	return 0;

@@ -7436,8 +7434,7 @@ int cmdreset(struct airo_info *ai) {
 
 	OUT4500(ai,COMMAND,CMD_SOFTRESET);
 
-	set_current_state (TASK_UNINTERRUPTIBLE);
-	schedule_timeout (HZ);          /* WAS 600 12/7/00 */
+	msleep(1000);			/* WAS 600 12/7/00 */
 
 	if(!waitbusy (ai)){
 		printk(KERN_INFO "Waitbusy hang AFTER RESET\n");

@@ -7464,8 +7461,7 @@ int setflashmode (struct airo_info *ai) 
 		OUT4500(ai, SWS3, FLASH_COMMAND);
 		OUT4500(ai, COMMAND,0);
 	}
-	set_current_state (TASK_UNINTERRUPTIBLE);
-	schedule_timeout (HZ/2); /* 500ms delay */
+	msleep(500);
 
 	if(!waitbusy(ai)) {
 		clear_bit (FLAG_FLASHING, &ai->flags);

@@ -7575,8 +7571,7 @@ int flashputbuf(struct airo_info *ai){
 int flashrestart(struct airo_info *ai,struct net_device *dev){
 	int    i,status;
 
-	set_current_state (TASK_UNINTERRUPTIBLE);
-	schedule_timeout (HZ);          /* Added 12/7/00 */
+	msleep(1000);			/* Added 12/7/00 */
 	clear_bit (FLAG_FLASHING, &ai->flags);
 	if (test_bit(FLAG_MPI, &ai->flags)) {
 		status = mpi_init_descriptors(ai);

@@ -7591,8 +7586,7 @@ int flashrestart(struct airo_info *ai,st
 				( ai, 2312, i >= MAX_FIDS / 2 );
 		}
 
-	set_current_state (TASK_UNINTERRUPTIBLE);
-	schedule_timeout (HZ);          /* Added 12/7/00 */
+	msleep(1000);			/* Added 12/7/00 */
 	return status;
 }
 #endif /* CISCO_EXT */

_