net/lanstreamer: replace
Subsystems (2)
PATCH 21/38 net/lanstreamer: replace
Any comments would be appreciated.
Description: Use ssleep() / msleep_interruptible() [as appropriate] instead of schedule_timeout() to guarantee the task delays as expected.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/net/tokenring/lanstreamer.c +2 -4
@@ -455,8 +455,7 @@ static int streamer_reset(struct net_devwritew (readw (streamer_mmio +BCTL ) |BCTL_SOFTRESET , streamer_mmio +BCTL ); t = jiffies;/* Hold soft reset bit for a while */ - current->state =TASK_UNINTERRUPTIBLE ; -schedule_timeout (HZ ); +ssleep (1 );writew (readw (streamer_mmio +BCTL ) & ~BCTL_SOFTRESET , streamer_mmio +BCTL );
@@ -512,8 +511,7 @@ static int streamer_reset(struct net_devwritew (SISR_MI , streamer_mmio +SISR_MASK_SUM );while (!((readw (streamer_mmio +SISR )) &SISR_SRB_REPLY )) { - current->state =TASK_INTERRUPTIBLE ; -schedule_timeout (HZ /10 ); +msleep_interruptible (100 );if (jiffies - t >40 *HZ ) {printk (KERN_ERR "IBM PCI tokenring card not responding\n" );
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors