diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2006-03-18 04:44:53 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2006-03-18 04:44:53 +0000 |
| commit | 19d78002e80be4d2a004b806fd8c5449cae0af0d (patch) | |
| tree | 66721ad3b59ecd9bd05f1bdf5cdacaabf5a7e9ff /sys/dev/ic/ami.c | |
| parent | 56685f0c199dc4037df6cf887df1950291283b4e (diff) | |
scsi completions never go via the generic done path now. xs is always set
in the scis done path
Diffstat (limited to 'sys/dev/ic/ami.c')
| -rw-r--r-- | sys/dev/ic/ami.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index f1e8c4f8f9d..4347ddad5b2 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.124 2006/03/18 03:13:43 dlg Exp $ */ +/* $OpenBSD: ami.c,v 1.125 2006/03/18 04:44:52 dlg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -1157,13 +1157,10 @@ ami_done_xs(struct ami_softc *sc, struct ami_ccb *ccb) ami_put_ccb(ccb); splx(s); - if (xs) { - timeout_del(&xs->stimeout); - xs->resid = 0; - xs->flags |= ITSDONE; - AMI_DPRINTF(AMI_D_CMD, ("scsi_done(%d) ", idx)); - scsi_done(xs); - } + timeout_del(&xs->stimeout); + xs->resid = 0; + xs->flags |= ITSDONE; + scsi_done(xs); return (0); } @@ -1171,7 +1168,6 @@ ami_done_xs(struct ami_softc *sc, struct ami_ccb *ccb) int ami_done_ccb(struct ami_softc *sc, struct ami_ccb *ccb) { - struct scsi_xfer *xs = ccb->ccb_xs; int s; if (ccb->ccb_data != NULL) { @@ -1196,14 +1192,6 @@ ami_done_ccb(struct ami_softc *sc, struct ami_ccb *ccb) splx(s); } - if (xs) { - timeout_del(&xs->stimeout); - xs->resid = 0; - xs->flags |= ITSDONE; - AMI_DPRINTF(AMI_D_CMD, ("scsi_done(%d) ", idx)); - scsi_done(xs); - } - return (0); } |