cciss: fix schedule_timeout() parameters
Change schedule_timeout() parameter to not be specific to HZ=1000. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Mike Miller <mike.miller@hp.com> Cc: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: "Cameron, Steve" <Steve.Cameron@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
d5d03eec9b
commit
4d76160947
|
@ -36,6 +36,7 @@
|
|||
#include <linux/proc_fs.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/hdreg.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/compat.h>
|
||||
|
@ -3489,7 +3490,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
|
|||
if (scratchpad == CCISS_FIRMWARE_READY)
|
||||
break;
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
schedule_timeout(HZ / 10); /* wait 100ms */
|
||||
schedule_timeout(msecs_to_jiffies(100)); /* wait 100ms */
|
||||
}
|
||||
if (scratchpad != CCISS_FIRMWARE_READY) {
|
||||
printk(KERN_WARNING "cciss: Board not ready. Timed out.\n");
|
||||
|
@ -3615,7 +3616,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
|
|||
break;
|
||||
/* delay and try again */
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
schedule_timeout(10);
|
||||
schedule_timeout(msecs_to_jiffies(1));
|
||||
}
|
||||
|
||||
#ifdef CCISS_DEBUG
|
||||
|
|
Loading…
Reference in a new issue