net/e100: replace
Subsystems (2)
PATCH 11/38 net/e100: replace
Any comments would be appreciated.
Description: Use msleep()/msleep_interruptible() [as appropriate] instead of schedule_timeout() to guarantee the task delays as expected.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/net/e100.c +5 -10
@@ -623,8 +623,7 @@ static int e100_self_test(struct nic *niwritel (selftest | dma_addr, &nic->csr->port);e100_write_flush (nic);/* Wait 10 msec for self-test to complete */ -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ /100 +1 ); +msleep (10 );/* Interrupts are enabled after self-test */ e100_disable_irq (nic);
@@ -672,8 +671,7 @@ static void e100_eeprom_write(struct nice100_write_flush (nic);udelay (4 ); }/* Wait 10 msec for cmd to complete */ -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ /100 +1 ); +msleep (10 );/* Chip deselect */ writeb (0 , &nic->csr->eeprom_ctrl_lo);
@@ -1758,8 +1756,7 @@ static int e100_loopback_test(struct nicmemset (skb->data,0xFF ,ETH_DATA_LEN );e100_xmit_frame (skb, nic->netdev); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ /100 +1 ); +msleep (10 );if (memcmp (nic->rx_to_clean->skb->data +sizeof (struct rfd ), skb->data,ETH_DATA_LEN ))
@@ -1845,8 +1842,7 @@ static void e100_get_regs(struct net_devmdio_read (netdev, nic->mii.phy_id, i);memset (nic->mem->dump_buf,0 ,sizeof (nic->mem->dump_buf));e100_exec_cb (nic,NULL , e100_dump); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ /100 +1 ); +msleep (10 );memcpy (&buff[2 +E100_PHY_REGS ], nic->mem->dump_buf,sizeof (nic->mem->dump_buf)); }
@@ -2020,8 +2016,7 @@ static int e100_phys_id(struct net_devicif (!data || data > (u32)(MAX_SCHEDULE_TIMEOUT /HZ )) data = (u32)(MAX_SCHEDULE_TIMEOUT /HZ );mod_timer (&nic->blink_timer, jiffies); -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout (data *HZ ); +msleep_interruptible (data *1000 );del_timer_sync (&nic->blink_timer);mdio_write (netdev, nic->mii.phy_id,MII_LED_CONTROL ,0 );
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors