patch-2.2.0-pre2 linux/drivers/scsi/wd7000.c

• Lines: 36
• Date: Tue Dec 29 11:40:35 1998
• Orig file: v2.2.0-pre1/linux/drivers/scsi/wd7000.c
• Orig date: Fri Oct 23 22:01:21 1998

diff -u --recursive --new-file v2.2.0-pre1/linux/drivers/scsi/wd7000.c linux/drivers/scsi/wd7000.c
@@ -791,7 +791,7 @@
     register unsigned WAITbits;
     register unsigned long WAITtimeout = jiffies + WAITnexttimeout;
 
-    while (jiffies <= WAITtimeout) {
+    while (time_before_eq(jiffies, WAITtimeout)) {
 	WAITbits = inb (port) & mask;
 
 	if (((WAITbits & allof) == allof) && ((WAITbits & noneof) == 0))
@@ -806,7 +806,7 @@
 {
     register unsigned long time = jiffies + how_long;
 
-    while (jiffies < time);
+    while (time_before(jiffies, time));
 }
 
 
@@ -868,7 +868,7 @@
 	    spin_unlock_irq(&io_request_lock);
 	    for (now = jiffies; now == jiffies; );	/* wait a jiffy */
 	    spin_lock_irq(&io_request_lock);
-	} while (freescbs < needed && jiffies <= timeout);
+	} while (freescbs < needed && time_before_eq(jiffies, timeout));
 	/*
 	 *  If we get here with enough free Scbs, we can take them.
 	 *  Otherwise, we timed out and didn't get enough.
@@ -1247,7 +1247,7 @@
      */
     mail_out (host, (struct scb *) &icb);
     timeout = jiffies + WAITnexttimeout;	/* wait up to 2 seconds */
-    while (icb.phase && jiffies < timeout)
+    while (icb.phase && time_before(jiffies, timeout))
 	barrier ();		/* wait for completion */
 
     if (icb.phase) {