diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2010-07-02 15:10:49 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2010-07-02 15:10:49 +0000 |
| commit | 8a4ba79c16ad87267052234d401d7b4ab8e78040 (patch) | |
| tree | a6bbb92d03b02aaaf227d2f5cd1d380453a7b9e2 /sys/dev | |
| parent | d9cee16486e7eab51371ca2f36a7b3e0fed59efe (diff) | |
timeout_add -> timeout_add_msec
ok dlg@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/siop.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index daefcb5d54f..a2016049846 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.60 2010/06/28 18:31:02 krw Exp $ */ +/* $OpenBSD: siop.c,v 1.61 2010/07/02 15:10:48 blambert Exp $ */ /* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */ /* @@ -1572,7 +1572,6 @@ siop_start(sc) struct siop_lun *siop_lun; struct siop_xfer *siop_xfer; u_int32_t dsa; - int timeout; int target, lun, tag, slot; int newcmd = 0; int doingready = 0; @@ -1722,11 +1721,8 @@ again: if (siop_cmd->cmd_c.status == CMDST_ACTIVE) { if ((siop_cmd->cmd_c.xs->flags & SCSI_POLL) == 0) { /* start expire timer */ - timeout = (u_int64_t) siop_cmd->cmd_c.xs->timeout * - (u_int64_t)hz / 1000; - if (timeout == 0) - timeout = 1; - timeout_add(&siop_cmd->cmd_c.xs->stimeout, timeout); + timeout_add_msec(&siop_cmd->cmd_c.xs->stimeout, + siop_cmd->cmd_c.xs->timeout); } } /* |