blob: 75f1379e1ce7ab817b82ba4e29b751b93da2b329 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
--- ./drivers/block/cciss.c.8 2006-03-01 12:59:45.000000000 +0300
+++ ./drivers/block/cciss.c 2006-03-01 17:36:20.000000000 +0300
@@ -1765,8 +1765,7 @@ static unsigned long pollcomplete(int ct
for (i = 20 * HZ; i > 0; i--) {
done = hba[ctlr]->access.command_completed(hba[ctlr]);
if (done == FIFO_EMPTY) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
+ msleep(1);
} else
return (done);
}
@@ -2500,8 +2499,7 @@ static int cciss_pci_init(ctlr_info_t *c
scratchpad = readl(c->vaddr + SA5_SCRATCHPAD_OFFSET);
if (scratchpad == CCISS_FIRMWARE_READY)
break;
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10); /* wait 100ms */
+ msleep(100); /* wait 100ms */
}
if (scratchpad != CCISS_FIRMWARE_READY) {
printk(KERN_WARNING "cciss: Board not ready. Timed out.\n");
@@ -2586,8 +2584,7 @@ static int cciss_pci_init(ctlr_info_t *c
if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
break;
/* delay and try again */
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(10);
+ msleep(10);
}
#ifdef CCISS_DEBUG
|
GitWeb
