From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>

They deal with wrapping correctly and are nicer to read.

Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/BusLogic.c  |    3 ++-
 drivers/scsi/osst.c      |    5 +++--
 drivers/scsi/ppa.c       |    3 ++-
 drivers/scsi/qlogicfc.c  |    3 ++-
 drivers/scsi/qlogicpti.c |    3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff -puN drivers/scsi/BusLogic.c~drivers-scsi-use-time_after-and-friends drivers/scsi/BusLogic.c
--- devel/drivers/scsi/BusLogic.c~drivers-scsi-use-time_after-and-friends	2006-03-11 02:51:03.000000000 -0800
+++ devel-akpm/drivers/scsi/BusLogic.c	2006-03-11 02:51:03.000000000 -0800
@@ -41,6 +41,7 @@
 #include <linux/stat.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/jiffies.h>
 #include <scsi/scsicam.h>
 
 #include <asm/dma.h>
@@ -2896,7 +2897,7 @@ static int BusLogic_QueueCommand(struct 
 		 */
 		if (HostAdapter->ActiveCommands[TargetID] == 0)
 			HostAdapter->LastSequencePoint[TargetID] = jiffies;
-		else if (jiffies - HostAdapter->LastSequencePoint[TargetID] > 4 * HZ) {
+		else if (time_after(jiffies, HostAdapter->LastSequencePoint[TargetID] + 4 * HZ)) {
 			HostAdapter->LastSequencePoint[TargetID] = jiffies;
 			QueueTag = BusLogic_OrderedQueueTag;
 		}
diff -puN drivers/scsi/osst.c~drivers-scsi-use-time_after-and-friends drivers/scsi/osst.c
--- devel/drivers/scsi/osst.c~drivers-scsi-use-time_after-and-friends	2006-03-11 02:51:03.000000000 -0800
+++ devel-akpm/drivers/scsi/osst.c	2006-03-11 02:51:03.000000000 -0800
@@ -49,6 +49,7 @@ static const char * osst_version = "0.99
 #include <linux/blkdev.h>
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>
 #include <asm/system.h>
@@ -856,7 +857,7 @@ static int osst_wait_frame(struct osst_t
 		    ) && result >= 0)
 		{
 #if DEBUG			
-			if (debugging || jiffies - startwait >= 2*HZ/OSST_POLL_PER_SEC)
+			if (debugging || time_after_eq(jiffies, startwait + 2*HZ/OSST_POLL_PER_SEC))
 				printk (OSST_DEB_MSG
 					"%s:D: Succ wait f fr %i (>%i): %i-%i %i (%i): %3li.%li s\n",
 					name, curr, curr+minlast, STp->first_frame_position,
@@ -867,7 +868,7 @@ static int osst_wait_frame(struct osst_t
 			return 0;
 		}
 #if DEBUG
-		if (jiffies - startwait >= 2*HZ/OSST_POLL_PER_SEC && notyetprinted)
+		if (time_after_eq(jiffies, startwait + 2*HZ/OSST_POLL_PER_SEC) && notyetprinted)
 		{
 			printk (OSST_DEB_MSG "%s:D: Wait for frame %i (>%i): %i-%i %i (%i)\n",
 				name, curr, curr+minlast, STp->first_frame_position,
diff -puN drivers/scsi/ppa.c~drivers-scsi-use-time_after-and-friends drivers/scsi/ppa.c
--- devel/drivers/scsi/ppa.c~drivers-scsi-use-time_after-and-friends	2006-03-11 02:51:03.000000000 -0800
+++ devel-akpm/drivers/scsi/ppa.c	2006-03-11 02:51:03.000000000 -0800
@@ -18,6 +18,7 @@
 #include <linux/parport.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 
 #include <scsi/scsi.h>
@@ -726,7 +727,7 @@ static int ppa_engine(ppa_struct *dev, s
 				retv--;
 
 			if (retv) {
-				if ((jiffies - dev->jstart) > (1 * HZ)) {
+				if (time_after(jiffies, dev->jstart + (1 * HZ))) {
 					printk
 					    ("ppa: Parallel port cable is unplugged!!\n");
 					ppa_fail(dev, DID_BUS_BUSY);
diff -puN drivers/scsi/qlogicfc.c~drivers-scsi-use-time_after-and-friends drivers/scsi/qlogicfc.c
--- devel/drivers/scsi/qlogicfc.c~drivers-scsi-use-time_after-and-friends	2006-03-11 02:51:03.000000000 -0800
+++ devel-akpm/drivers/scsi/qlogicfc.c	2006-03-11 02:51:03.000000000 -0800
@@ -61,6 +61,7 @@
 #include <linux/unistd.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include "scsi.h"
@@ -1325,7 +1326,7 @@ static int isp2x00_queuecommand(Scsi_Cmn
 		cmd->control_flags = cpu_to_le16(CFLAG_READ);
 
 	if (Cmnd->device->tagged_supported) {
-		if ((jiffies - hostdata->tag_ages[Cmnd->device->id]) > (2 * ISP_TIMEOUT)) {
+		if (time_after(jiffies, hostdata->tag_ages[Cmnd->device->id] + (2 * ISP_TIMEOUT))) {
 			cmd->control_flags |= cpu_to_le16(CFLAG_ORDERED_TAG);
 			hostdata->tag_ages[Cmnd->device->id] = jiffies;
 		} else
diff -puN drivers/scsi/qlogicpti.c~drivers-scsi-use-time_after-and-friends drivers/scsi/qlogicpti.c
--- devel/drivers/scsi/qlogicpti.c~drivers-scsi-use-time_after-and-friends	2006-03-11 02:51:03.000000000 -0800
+++ devel-akpm/drivers/scsi/qlogicpti.c	2006-03-11 02:51:03.000000000 -0800
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/jiffies.h>
 
 #include <asm/byteorder.h>
 
@@ -1017,7 +1018,7 @@ static inline void cmd_frob(struct Comma
 	if (Cmnd->device->tagged_supported) {
 		if (qpti->cmd_count[Cmnd->device->id] == 0)
 			qpti->tag_ages[Cmnd->device->id] = jiffies;
-		if ((jiffies - qpti->tag_ages[Cmnd->device->id]) > (5*HZ)) {
+		if (time_after(jiffies, qpti->tag_ages[Cmnd->device->id] + (5*HZ))) {
 			cmd->control_flags = CFLAG_ORDERED_TAG;
 			qpti->tag_ages[Cmnd->device->id] = jiffies;
 		} else
_