block/xd: replace schedule_timeout()
Subsystems (2)
PATCH 8/8 block/xd: replace schedule_timeout()
Any comments would be appreciated.
Description: Use msleep() or msleep_interruptible() [as appropriate] instead of schedule_timeout() to gurantee the task delays as expected. As a result changed the units of the timeout variable from jiffies to msecs.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/block/xd.c +5 -9
@@ -62,7 +62,7 @@ static int xd[5] = { -1,-1,-1,-1, };#define XD_DONT_USE_DMA 0/* Initial value. may be overriden using "nodma" module option */ -#define XD_INIT_DISK_DELAY (30*HZ/1000)/* 30 ms delay during disk initialization */ +#define XD_INIT_DISK_DELAY (30)/* 30 ms delay during disk initialization */ /* Above may need to be increased if a problem with the 2nd drive detection (ST11M controller) or resetting a controller (WD) appears */
@@ -625,14 +625,12 @@ static u_char __init xd_initdrives (voidfor (i =0 ; i <XD_MAXDRIVES ; i++) {xd_build (cmdblk,CMD_TESTREADY ,i,0 ,0 ,0 ,0 ,0 );if (!xd_command (cmdblk,PIO_MODE ,NULL ,NULL ,NULL ,XD_TIMEOUT *8 )) { -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout (XD_INIT_DISK_DELAY ); +msleep_interruptible (XD_INIT_DISK_DELAY );init_drive (count); count++; -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout (XD_INIT_DISK_DELAY ); +msleep_interruptible (XD_INIT_DISK_DELAY ); } }return (count);
@@ -753,8 +751,7 @@ static void __init xd_wd_init_controlleroutb (0 ,XD_RESET );/* reset the controller */ -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (XD_INIT_DISK_DELAY ); +msleep (XD_INIT_DISK_DELAY ); }static void __init xd_wd_init_drive (u_char drive)
@@ -928,8 +925,7 @@ If you need non-standard settings use th xd_maxsectors =0x01 ;outb (0 ,XD_RESET );/* reset the controller */ -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (XD_INIT_DISK_DELAY ); +msleep (XD_INIT_DISK_DELAY ); }static void __init xd_xebec_init_drive (u_char drive)
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors