Skip to contentSkip to conversation

net/ibmtr: replace schedule_timeout()

PATCH In review Nishanth Aravamudan 1 participant 2 messages Jul 27, 2004 – Jul 28, 2004

Subsystems (2)
Network drivers Kernel janitors
lore
Share & tools
lore

Nishanth Aravamudan

author
#0 lore raw

PATCH 1/1 net/ibmtr: replace schedule_timeout()

I would appreciate any comments from the janitors list.

Applys-to: 2.6.7

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

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/net/tokenring/ibmtr.c +3 -3
@@ -108,7 +108,8 @@ in the event that chatty debug messages 
 #define IBMTR_DEBUG_MESSAGES 0
 
 #include <linux/module.h>
-
+#include <linux/delay.h>
+ 
 #ifdef PCMCIA		/* required for ibmtr_cs.c to build */
 #undef MODULE		/* yes, really */
 #undef ENABLE_PAGING

@@ -857,8 +858,7 @@ static int tok_init_card(struct net_devi
 	writeb(~INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_EVEN);
 	outb(0, PIOaddr + ADAPTRESET);
 
-	current->state=TASK_UNINTERRUPTIBLE;
-	schedule_timeout(TR_RST_TIME); /* wait 50ms */
+	msleep(jiffies_to_msecs(TR_RST_TIME));
 
 	outb(0, PIOaddr + ADAPTRESETREL);
 #ifdef ENABLE_PAGING

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#1 lore raw
Quoted 8 lines · Nishanth Aravamudan

I would appreciate any comments from the janitors list.

Applys-to: 2.6.7

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

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

The previous patch introduced extraneous whitespace, sorry. Thanks, Domen.

drivers/net/tokenring/ibmtr.c +2 -2
@@ -108,6 +108,7 @@ in the event that chatty debug messages 
 #define IBMTR_DEBUG_MESSAGES 0
 
 #include <linux/module.h>
+#include <linux/delay.h>
 
 #ifdef PCMCIA		/* required for ibmtr_cs.c to build */
 #undef MODULE		/* yes, really */

@@ -857,8 +858,7 @@ static int tok_init_card(struct net_devi
 	writeb(~INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_EVEN);
 	outb(0, PIOaddr + ADAPTRESET);
 
-	current->state=TASK_UNINTERRUPTIBLE;
-	schedule_timeout(TR_RST_TIME); /* wait 50ms */
+	msleep(jiffies_to_msecs(TR_RST_TIME));
 
 	outb(0, PIOaddr + ADAPTRESETREL);
 #ifdef ENABLE_PAGING

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors