|
@@ -36,6 +36,7 @@
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/init.h>
|
|
#include <linux/init.h>
|
|
|
|
+#include <linux/jiffies.h>
|
|
#include <linux/hdreg.h>
|
|
#include <linux/hdreg.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/compat.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)
|
|
if (scratchpad == CCISS_FIRMWARE_READY)
|
|
break;
|
|
break;
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
- schedule_timeout(HZ / 10); /* wait 100ms */
|
|
|
|
|
|
+ schedule_timeout(msecs_to_jiffies(100)); /* wait 100ms */
|
|
}
|
|
}
|
|
if (scratchpad != CCISS_FIRMWARE_READY) {
|
|
if (scratchpad != CCISS_FIRMWARE_READY) {
|
|
printk(KERN_WARNING "cciss: Board not ready. Timed out.\n");
|
|
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;
|
|
break;
|
|
/* delay and try again */
|
|
/* delay and try again */
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
- schedule_timeout(10);
|
|
|
|
|
|
+ schedule_timeout(msecs_to_jiffies(1));
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CCISS_DEBUG
|
|
#ifdef CCISS_DEBUG
|