ide-cd: replace schedule_timeout() with
PATCH 1/1 ide-cd: replace schedule_timeout() with
I would appreciate any comments from the janitors list. This is one (of many) cases where I made a decision about replacing
set_current_state(TASK_INTERRUPTIBLE);schedule_timeout(some_time);
with
msleep(jiffies_to_msecs(some_time));
msleep() is not exactly the same as the previous code, but I only did this replacement where I thought long delays were *desired*. If this is not the case here, then just disregard this patch. I think in this case, though, because of the while() loop, this was the desired effect.
Thanks,
Nish
Applys-to: 2.6.7
Description: Replace cdrom_sleep() with msleep() and remove cdrom_sleep() definition.
drivers/ide/ide-cd.c +1 -14
@@ -1527,19 +1527,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) {
@@ -1574,7 +1561,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 ); +msleep (2000 ); }else {/* Otherwise, don't retry. */ retries =0 ;
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors