patch-2.2.0-pre2 linux/drivers/block/pdc4030.c

• Lines: 34
• Date: Tue Dec 29 11:24:57 1998
• Orig file: v2.2.0-pre1/linux/drivers/block/pdc4030.c
• Orig date: Thu May 7 22:51:48 1998

diff -u --recursive --new-file v2.2.0-pre1/linux/drivers/block/pdc4030.c linux/drivers/block/pdc4030.c
@@ -92,13 +92,13 @@
 	timeout = HZ * 10;
 	timeout += jiffies;
 	do {
-		if(jiffies > timeout) {
+		if(time_after(jiffies, timeout)) {
 			return 2; /* device timed out */
 		}
 		/* This is out of delay_10ms() */
 		/* Delays at least 10ms to give interface a chance */
 		timer = jiffies + (HZ + 99)/100 + 1;
-		while (timer > jiffies);
+		while (time_after(timer, jiffies));
 		status_val = IN_BYTE(IDE_SECTOR_REG);
 	} while (status_val != 0x50 && status_val != 0x70);
 
@@ -257,7 +257,7 @@
 	struct request *rq;
 
         if (IN_BYTE(IDE_NSECTOR_REG) != 0) {
-            if (jiffies < hwgroup->poll_timeout) {
+            if (time_before(jiffies, hwgroup->poll_timeout)) {
                 ide_set_handler (drive, &promise_write_pollfunc, 1);
                 return; /* continue polling... */
             }
@@ -335,7 +335,7 @@
 		if(IN_BYTE(IDE_SELECT_REG) & 0x01)
 		    return;
 		udelay(1);
-	    } while (jiffies < timeout);
+	    } while (time_before(jiffies, timeout));
 	    printk("%s: reading: No DRQ and not waiting - Odd!\n",
 		   drive->name);
 	    return;