diff options
| author | Steven Hartland <smh@FreeBSD.org> | 2014-11-21 21:01:24 +0000 |
|---|---|---|
| committer | Steven Hartland <smh@FreeBSD.org> | 2014-11-21 21:01:24 +0000 |
| commit | 85c9dd9d895261632d58cf98da6608b93dd5d7f8 (patch) | |
| tree | 5ebdafcf9900ec8ee871257dadfca8fdc7f4aa95 /sys/dev/mvs/mvs.c | |
| parent | 7db6c5cde6083b3cf76f1f85225c19052722dfd5 (diff) | |
Notes
Diffstat (limited to 'sys/dev/mvs/mvs.c')
| -rw-r--r-- | sys/dev/mvs/mvs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index 8118aa7370ca..8feba1f71830 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -1415,8 +1415,8 @@ mvs_legacy_execute_transaction(struct mvs_slot *slot) } } /* Start command execution timeout */ - callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 1000, - (timeout_t*)mvs_timeout, slot); + callout_reset_sbt(&slot->timeout, SBT_1MS * ccb->ccb_h.timeout, 0, + (timeout_t*)mvs_timeout, slot, 0); } /* Must be called with channel locked. */ @@ -1529,8 +1529,8 @@ mvs_execute_transaction(struct mvs_slot *slot) ATA_OUTL(ch->r_mem, EDMA_REQQIP, ch->dma.workrq_bus + MVS_CRQB_OFFSET + (MVS_CRQB_SIZE * ch->out_idx)); /* Start command execution timeout */ - callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 1000, - (timeout_t*)mvs_timeout, slot); + callout_reset_sbt(&slot->timeout, SBT_1MS * ccb->ccb_h.timeout, 0, + (timeout_t*)mvs_timeout, slot, 0); return; } @@ -1567,9 +1567,9 @@ mvs_rearm_timeout(device_t dev) continue; if ((ch->toslots & (1 << i)) == 0) continue; - callout_reset(&slot->timeout, - (int)slot->ccb->ccb_h.timeout * hz / 2000, - (timeout_t*)mvs_timeout, slot); + callout_reset_sbt(&slot->timeout, + SBT_1MS * slot->ccb->ccb_h.timeout / 2, 0, + (timeout_t*)mvs_timeout, slot, 0); } } |