summaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-06-30 01:03:42 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-06-30 01:03:42 +0000
commitf0a1c73c54dab14ed95af7efc7f7a1ad395ef175 (patch)
tree7323ea6512ae7ed00b23fe763403da51be15af0a /sys/dev/ata
parentf2ab17d342b804a7a4a23acc7cd03ab41ed5a96b (diff)
Convert some parts to new timeouts.
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/ata_wdc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 32147d4ecfa..dba5130af66 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -167,7 +167,7 @@ wdc_ata_bio_start(chp, xfer)
/* start timeout machinery */
if ((ata_bio->flags & ATA_POLL) == 0)
- timeout(wdctimeout, chp, ATA_DELAY / 1000 * hz);
+ timeout_add(&chp->ch_timo, ATA_DELAY / 1000 * hz);
_wdc_ata_bio_start(chp, xfer);
}
@@ -517,7 +517,7 @@ wdc_ata_bio_kill_xfer(chp, xfer)
{
struct ata_bio *ata_bio = xfer->cmd;
- untimeout(wdctimeout, chp);
+ timeout_del(&chp->ch_timo);
/* remove this command from xfer queue */
wdc_free_xfer(chp, xfer);
@@ -544,7 +544,7 @@ wdc_ata_bio_done(chp, xfer)
(u_int)xfer->c_flags),
DEBUG_XFERS);
- untimeout(wdctimeout, chp);
+ timeout_del(&chp->ch_timo);
if (ata_bio->error == NOERROR)
drvp->n_dmaerrs = 0;
else if (drvp->n_dmaerrs >= NERRS_MAX) {