net/3c505: replace schedule_timeout() with msleep()

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

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

[email protected]

author

2004-10-30 22:42 UTC #0 lore raw

PATCH 2/18 net/3c505: replace schedule_timeout() with msleep()

Any comments would be appreciated.

Description: Use msleep() instead of schedule_timeout() to guarantee the task delays as expected.

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

Acked-by Phil Blundell <[email protected]>

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

---

 linux-2.6.10-rc1-max/drivers/net/3c505.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

drivers/net/3c505.c renamed from drivers/net/3c505.c~msleep-drivers_net_3c505 +2 -4

diff -puN drivers/net/3c505.c~msleep-drivers_net_3c505 drivers/net/3c505.c
@@ -1327,8 +1327,7 @@ static int __init elp_sense(struct net_d
 	if (orig_HSR & DIR) {
 		/* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */
 		outb(0, dev->base_addr + PORT_CONTROL);
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(30*HZ/100);
+		msleep(300);
 		if (inb_status(addr) & DIR) {
 			if (elp_debug > 0)
 				printk(notfound_msg, 2);

@@ -1337,8 +1336,7 @@ static int __init elp_sense(struct net_d
 	} else {
 		/* If HCR.DIR is down, we pull it up. HSR.DIR should follow. */
 		outb(DIR, dev->base_addr + PORT_CONTROL);
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(30*HZ/100);
+		msleep(300);
 		if (!(inb_status(addr) & DIR)) {
 			if (elp_debug > 0)
 				printk(notfound_msg, 3);