block/cciss: fix sleep-loop logic

@@ -1702,16 +1702,15 @@ static int cciss_revalidate(struct gendi
 static unsigned long pollcomplete(int ctlr)
 {
 	unsigned long done;
-	int i;
+	unsigned long stop = jiffies + 20 * HZ;
 
 	/* Wait (up to 20 seconds) for a command to complete */
 
-	for (i = 20 * HZ; i > 0; i--) {
+	while (time_before(jiffies, stop)) {
 		done = hba[ctlr]->access.command_completed(hba[ctlr]);
-		if (done == FIFO_EMPTY) {
-			set_current_state(TASK_UNINTERRUPTIBLE);
-			schedule_timeout(1);
-		} else
+		if (done == FIFO_EMPTY)
+			msleep(10);
+		else
 			return (done);
 	}
 	/* Invalid address to tell caller we ran out of time */

@@ -2324,6 +2323,7 @@ static int cciss_pci_init(ctlr_info_t *c
 	__u32 cfg_base_addr;
 	__u64 cfg_base_addr_index;
 	int i;
+	unsigned long stop;
 
 	/* check to see if controller has been disabled */
 	/* BEFORE trying to enable it */

@@ -2396,12 +2396,12 @@ static int cciss_pci_init(ctlr_info_t *c
 
 	/* Wait for the board to become ready.  (PCI hotplug needs this.)
 	 * We poll for up to 120 secs, once per 100ms. */
-	for (i=0; i < 1200; i++) {
+	stop = jiffies + 120 * HZ;
+	while (time_before(jiffies, stop)) {
 		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);
 	}
 	if (scratchpad != CCISS_FIRMWARE_READY) {
 		printk(KERN_WARNING "cciss: Board not ready.  Timed out.\n");

@@ -2482,12 +2482,12 @@ static int cciss_pci_init(ctlr_info_t *c
 	/* under certain very rare conditions, this can take awhile.
 	 * (e.g.: hot replace a failed 144GB drive in a RAID 5 set right
 	 * as we enter this code.) */
-	for(i=0;i<MAX_CONFIG_WAIT;i++) {
+	stop = jiffies + msecs_to_jiffies(MAX_CONFIG_WAIT);
+	while (time_before(jiffies, stop)) {
 		if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
 			break;
 		/* delay and try again */
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(10);
+		msleep(100);
 	}	
 
 #ifdef CCISS_DEBUG