From: Nishanth Aravamudan Subject: [KJ] [UPDATE PATCH] block/pcd: replace pcd_sleep() with msleep()/ssleep() Use msleep()/ssleep() instead of pcd_sleep() to guarantee the task delays as expected. TASK_INTERRUPTIBLE is used in the original code, however there is no check on the return values / for signals, thus I believe TASK_UNINTERRUPTIBLE (and hence msleep()) is more appropriate. Remove definition of pcd_sleep(). Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- pcd.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) Index: quilt/drivers/block/paride/pcd.c =================================================================== --- quilt.orig/drivers/block/paride/pcd.c +++ quilt/drivers/block/paride/pcd.c @@ -514,12 +514,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; @@ -529,11 +523,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(20); /* delay a bit */ k = 0; while ((k++ < PCD_RESET_TMO) && (status_reg(cd) & IDE_BUSY)) - pcd_sleep(HZ / 10); + msleep(100); flg = 1; for (i = 0; i < 5; i++) @@ -572,7 +566,7 @@ static int pcd_ready_wait(struct pcd_uni if (!(((p & 0xffff) == 0x0402) || ((p & 0xff) == 6))) return p; k++; - pcd_sleep(HZ); + ssleep(1); } return 0x000020; /* timeout */ }