diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/block/pdc4030.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/block/pdc4030.c')
| -rw-r--r-- | drivers/block/pdc4030.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/pdc4030.c b/drivers/block/pdc4030.c index b5b13b9cb..e032da579 100644 --- a/drivers/block/pdc4030.c +++ b/drivers/block/pdc4030.c @@ -92,13 +92,13 @@ int pdc4030_cmd(ide_drive_t *drive, byte cmd) 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 @@ static void promise_write_pollfunc (ide_drive_t *drive) 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 @@ void do_pdc4030_io (ide_drive_t *drive, struct request *rq) 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; |