diff options
author | Marcelo Feitoza Parisi <marcelo@feitoza.com.br> | 2006-03-28 04:56:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 12:16:07 -0500 |
commit | 60c904ae5bded8bb71f7bff7d63f2a6959d2a8e4 (patch) | |
tree | af7593441b9d640302a73a6406218a6b9cdc6aa2 /drivers/scsi/ppa.c | |
parent | 9bae1ff3e7926fe5e92db2f3c6d8832f18f777bc (diff) |
[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/ppa.c')
-rw-r--r-- | drivers/scsi/ppa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index 05347eed9dd..fee843fab1c 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/parport.h> | 18 | #include <linux/parport.h> |
19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/jiffies.h> | ||
21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
22 | 23 | ||
23 | #include <scsi/scsi.h> | 24 | #include <scsi/scsi.h> |
@@ -726,7 +727,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd) | |||
726 | retv--; | 727 | retv--; |
727 | 728 | ||
728 | if (retv) { | 729 | if (retv) { |
729 | if ((jiffies - dev->jstart) > (1 * HZ)) { | 730 | if (time_after(jiffies, dev->jstart + (1 * HZ))) { |
730 | printk | 731 | printk |
731 | ("ppa: Parallel port cable is unplugged!!\n"); | 732 | ("ppa: Parallel port cable is unplugged!!\n"); |
732 | ppa_fail(dev, DID_BUS_BUSY); | 733 | ppa_fail(dev, DID_BUS_BUSY); |