ide/pmac: replace schedule_timeout() with
Subsystems (2)
PATCH 1/1 ide/pmac: replace schedule_timeout() with
I would appreciate any comments from the janitors list.
Thanks,
Nish
Applys-to: 2.6.7
Description: Use msleep() instead of schedule_timeout() to guarantee the desired delay.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/ide/ppc/pmac.c +4 -8
@@ -1126,11 +1126,9 @@ pmac_ide_do_resume(ide_hwif_t *hwif)if (!pmif->mediabay) { ppc_md.feature_call (PMAC_FTR_IDE_RESET , pmif->node, pmif->aapl_bus_id,1 ); ppc_md.feature_call (PMAC_FTR_IDE_ENABLE , pmif->node, pmif->aapl_bus_id,1 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ /100 ); +msleep (10 ); ppc_md.feature_call (PMAC_FTR_IDE_RESET , pmif->node, pmif->aapl_bus_id,0 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (IDE_WAKEUP_DELAY ); +msleep (jiffies_to_msecs (IDE_WAKEUP_DELAY )); }/* Sanitize drive timings */
@@ -1208,11 +1206,9 @@ pmac_ide_setup_device(pmac_ide_hwif_t *p/* This is necessary to enable IDE when net-booting */ ppc_md.feature_call (PMAC_FTR_IDE_RESET , np, pmif->aapl_bus_id,1 ); ppc_md.feature_call (PMAC_FTR_IDE_ENABLE , np, pmif->aapl_bus_id,1 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ /100 ); +msleep (10 ); ppc_md.feature_call (PMAC_FTR_IDE_RESET , np, pmif->aapl_bus_id,0 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (IDE_WAKEUP_DELAY ); +msleep (jiffies_to_msecs (IDE_WAKEUP_DELAY )); }/* Setup MMIO ops */
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors