Any comments would be appreciated. This is a re-push of a patch I
submitted 19 July which hasn't been merged as of
2.6.9-rc1-mm5/2.6.9-rc2.
Description: msleep_interruptible() is used instead of pcd_sleep()
to guarantee the task delays as expected. The defintion of pcd_sleep()
is also removed.
Signed-off-by: Nishanth Aravamudan <[email protected]>
Signed-off-by: Maximilian Attems <[email protected]>
---
linux-2.6.9-rc2-bk7-max/drivers/block/paride/pcd.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff -puN drivers/block/paride/pcd.c~msleep_interruptible-drivers_block_pcd drivers/block/paride/pcd.c
--- linux-2.6.9-rc2-bk7/drivers/block/paride/pcd.c~msleep_interruptible-drivers_block_pcd 2004-09-21 21:07:52.000000000 +0200
+++ linux-2.6.9-rc2-bk7-max/drivers/block/paride/pcd.c 2004-09-21 21:07:52.000000000 +0200
@@ -534,12 +534,6 @@ static int pcd_tray_move(struct cdrom_de
position ? "eject" : "close tray");
}
-static void pcd_sleep(int cs)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(cs);
-}
-
static int pcd_reset(struct pcd_unit *cd)
{
int i, k, flg;
@@ -549,11 +543,11 @@ static int pcd_reset(struct pcd_unit *cd
write_reg(cd, 6, 0xa0 + 0x10 * cd->drive);
write_reg(cd, 7, 8);
- pcd_sleep(20 * HZ / 1000); /* delay a bit */
+ msleep_interruptible(20); /* delay a bit */
k = 0;
while ((k++ < PCD_RESET_TMO) && (status_reg(cd) & IDE_BUSY))
- pcd_sleep(HZ / 10);
+ msleep_interruptible(100);
flg = 1;
for (i = 0; i < 5; i++)
@@ -592,7 +586,7 @@ static int pcd_ready_wait(struct pcd_uni
if (!(((p & 0xffff) == 0x0402) || ((p & 0xff) == 6)))
return p;
k++;
- pcd_sleep(HZ);
+ msleep_interruptible(1000);
}
return 0x000020; /* timeout */
}
_