diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-01-10 00:40:26 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-01-10 00:40:26 +0000 |
| commit | 6c9d120e69347916e938b171bd7ce94ee85ad257 (patch) | |
| tree | 2d2fee8948676c7e4b09c60a30e675b724a4acc9 /sys/dev | |
| parent | 11f7362a3bdd215142b66c71001c8984508cd771 (diff) | |
A couple of missed ITSDONE setting before scsi_done().
seagate/trm/aha1742 were the only drivers paranoid enough to check
ITSDONE on getting the xs to execute. And optimistic enough to think
simply restting the flag would be a good thing. Have them chill out
like everyone else, reducing ITSDONE noise some more.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/eisa/aha1742.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/trm.c | 9 | ||||
| -rw-r--r-- | sys/dev/isa/aha.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/seagate.c | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c index 8189457b8ac..47da762f604 100644 --- a/sys/dev/eisa/aha1742.c +++ b/sys/dev/eisa/aha1742.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha1742.c,v 1.36 2010/01/10 00:10:23 krw Exp $ */ +/* $OpenBSD: aha1742.c,v 1.37 2010/01/10 00:40:25 krw Exp $ */ /* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */ /* @@ -951,10 +951,6 @@ ahb_scsi_cmd(xs) * then we can't allow it to sleep */ flags = xs->flags; - if (flags & ITSDONE) { - printf("%s: done?\n", sc->sc_dev.dv_xname); - xs->flags &= ~ITSDONE; - } if ((ecb = ahb_get_ecb(sc, flags)) == NULL) { return (NO_CCB); } diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c index 15a2157b70e..7aa9e4c0067 100644 --- a/sys/dev/ic/trm.c +++ b/sys/dev/ic/trm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trm.c,v 1.15 2010/01/10 00:10:23 krw Exp $ +/* $OpenBSD: trm.c,v 1.16 2010/01/10 00:40:25 krw Exp $ * ------------------------------------------------------------ * O.S : OpenBSD * File Name : trm.c @@ -392,13 +392,6 @@ trm_scsi_cmd(struct scsi_xfer *xs) return COMPLETE; } - if (xferflags & ITSDONE) { -#ifdef TRM_DEBUG0 - printf("%s: Is it done?\n", sc->sc_device.dv_xname); -#endif - xs->flags &= ~ITSDONE; - } - xs->error = XS_NOERROR; xs->status = SCSI_OK; xs->resid = 0; diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 4991f6e2112..3b4104596ed 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.65 2009/11/22 14:14:11 krw Exp $ */ +/* $OpenBSD: aha.c,v 1.66 2010/01/10 00:40:25 krw Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -881,7 +881,6 @@ aha_done(sc, ccb) } else xs->resid = 0; } - xs->flags |= ITSDONE; if (VOLATILE_XS(xs)) { wakeup(ccb); diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index e60f5c9bcc4..574689cb667 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: seagate.c,v 1.31 2010/01/10 00:10:23 krw Exp $ */ +/* $OpenBSD: seagate.c,v 1.32 2010/01/10 00:40:25 krw Exp $ */ /* * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver @@ -544,10 +544,6 @@ sea_scsi_cmd(struct scsi_xfer *xs) SC_DEBUG(sc_link, SDEV_DB2, ("sea_scsi_cmd\n")); flags = xs->flags; - if (flags & ITSDONE) { - printf("%s: done?\n", sea->sc_dev.dv_xname); - xs->flags &= ~ITSDONE; - } if ((scb = sea_get_scb(sea, flags)) == NULL) { return (NO_CCB); } |