diff options
| author | Marcelo Feitoza Parisi <marcelo@feitoza.com.br> | 2006-03-28 01:56:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 09:16:07 -0800 |
| commit | 60c904ae5bded8bb71f7bff7d63f2a6959d2a8e4 (patch) | |
| tree | af7593441b9d640302a73a6406218a6b9cdc6aa2 /drivers/scsi/osst.c | |
| parent | 9bae1ff3e7926fe5e92db2f3c6d8832f18f777bc (diff) | |
| download | op-kernel-dev-60c904ae5bded8bb71f7bff7d63f2a6959d2a8e4.zip op-kernel-dev-60c904ae5bded8bb71f7bff7d63f2a6959d2a8e4.tar.gz | |
[PATCH] drivers/scsi/*: use time_after() and friends
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/osst.c')
| -rw-r--r-- | drivers/scsi/osst.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 66ea47a..e3bd4bc 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c @@ -49,6 +49,7 @@ static const char * osst_version = "0.99.4"; #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_tape * STp, struct osst_request ** aSRpnt ) && 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_tape * STp, struct osst_request ** aSRpnt 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, |
