ide/ide-cd: use ssleep() instead of schedule_timeout()
PATCH 1/1 ide/ide-cd: use ssleep() instead of schedule_timeout()
Description: Uses ssleep() in place of cdrom_sleep() to guarantee the task delays as expected. Remove cdrom_sleep() definition, as this is the only place where it is called.
Signed-off-by Nishanth Aravamudan
Acked-by Jens Axboe <[email protected]>
Signed-off-by Domen Puncer <[email protected]>
---
kj-domen/drivers/ide/ide-cd.c | 15 +-------------- 1 files changed, 1 insertion(+), 14 deletions(-)
drivers/ide/ide-cd.c renamed from drivers/ide/ide-cd.c~msleep-drivers_ide_ide-cd +1 -14
@@ -1464,19 +1464,6 @@ static ide_startstop_t cdrom_do_packet_c } -/* Sleep for TIME jiffies. -Not to be called from an interrupt handler. */ -static -void cdrom_sleep (int time) -{ -int sleep = time; - -do { -set_current_state (TASK_INTERRUPTIBLE ); - sleep =schedule_timeout (sleep); - }while (sleep); -} -static int cdrom_queue_packet_command (ide_drive_t *drive,struct request *rq) {
@@ -1511,7 +1498,7 @@ int cdrom_queue_packet_command(ide_drive/* The drive is in the process of loading a disk. Retry, but wait a little to give the drive time to complete the load. */ -cdrom_sleep (2 *HZ ); +ssleep (2 ); }else {/* Otherwise, don't retry. */ retries =0 ;
_