[patch 02/15] block/xd: replace schedule_timeout() with msleep()/msleep_interruptible()
Any comments would be appreciated.
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]>
Signed-off-by: Maximilian Attems <[EMAIL PROTECTED]>
Signed-off-by: Domen Puncer <[EMAIL PROTECTED]>
---
kj-domen/drivers/block/xd.c | 14 +-
1 files changed, 5 insertions(+), 9 deletions(-)
diff -puN drivers/block/xd.c~msleep-drivers_block_xd drivers/block/xd.c
--- kj/drivers/block/xd.c~msleep-drivers_block_xd 2005-03-05
16:09:12.0 +0100
+++ kj-domen/drivers/block/xd.c 2005-03-05 16:09:12.0 +0100
@@ -62,7 +62,7 @@ static int xd[5] = { -1,-1,-1,-1, };
#define XD_DONT_USE_DMA0 /* 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 */
@@ -633,14 +633,12 @@ static u_char __init xd_initdrives (void
for (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);
@@ -761,8 +759,7 @@ static void __init xd_wd_init_controller
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_wd_init_drive (u_char drive)
@@ -936,8 +933,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)
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[patch 02/15] block/xd: replace schedule_timeout() with msleep()/msleep_interruptible()
Any comments would be appreciated.
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]
Signed-off-by: Maximilian Attems [EMAIL PROTECTED]
Signed-off-by: Domen Puncer [EMAIL PROTECTED]
---
kj-domen/drivers/block/xd.c | 14 +-
1 files changed, 5 insertions(+), 9 deletions(-)
diff -puN drivers/block/xd.c~msleep-drivers_block_xd drivers/block/xd.c
--- kj/drivers/block/xd.c~msleep-drivers_block_xd 2005-03-05
16:09:12.0 +0100
+++ kj-domen/drivers/block/xd.c 2005-03-05 16:09:12.0 +0100
@@ -62,7 +62,7 @@ static int xd[5] = { -1,-1,-1,-1, };
#define XD_DONT_USE_DMA0 /* 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 */
@@ -633,14 +633,12 @@ static u_char __init xd_initdrives (void
for (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);
@@ -761,8 +759,7 @@ static void __init xd_wd_init_controller
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_wd_init_drive (u_char drive)
@@ -936,8 +933,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)
_
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
