diff options
| author |   krw <krw@openbsd.org> | 2020-03-10 22:31:36 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-03-10 22:31:36 +0000 |
| commit | c7c5838477293bf63ab2832933941f1f21c1176f (patch) | |
| tree | bc425be4dcfc5a69c99abe4d1144a94dfe813bbc | |
| parent | The return value of rt_ifa_purge() is ignored, so stop (diff) | |
| download | wireguard-openbsd-c7c5838477293bf63ab2832933941f1f21c1176f.tar.xz wireguard-openbsd-c7c5838477293bf63ab2832933941f1f21c1176f.zip | |
Variables 'nowait' amd 'flags' should have died in 2008 with r1.36's
removal of internal queuing of scsi_xfer's. Put them out of their
misery. Nuke an obsolete comment in passing.
CID 1453357.
| -rw-r--r-- | sys/dev/ic/adw.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index d8c455b5417..29e65855b04 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw.c,v 1.60 2020/02/18 20:24:52 krw Exp $ */ +/* $OpenBSD: adw.c,v 1.61 2020/03/10 22:31:36 krw Exp $ */ /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */ /* @@ -529,8 +529,7 @@ adw_scsi_cmd(struct scsi_xfer *xs) struct scsi_link *sc_link = xs->sc_link; ADW_SOFTC *sc = sc_link->adapter_softc; ADW_CCB *ccb; - int s, nowait = 0, retry = 0; - int flags; + int s, retry = 0; /* * get a ccb to use. If the transfer @@ -538,15 +537,12 @@ adw_scsi_cmd(struct scsi_xfer *xs) * then we can't allow it to sleep */ - flags = xs->flags; - if (nowait) - flags |= SCSI_NOSLEEP; ccb = xs->io; ccb->xs = xs; ccb->timeout = xs->timeout; - if (adw_build_req(xs, ccb, flags)) { + if (adw_build_req(xs, ccb, xs->flags)) { retryagain: s = splbio(); retry = adw_queue_ccb(sc, ccb, retry); @@ -562,9 +558,6 @@ retryagain: return; } - /* - * Usually return SUCCESSFULLY QUEUED - */ if ((xs->flags & SCSI_POLL) == 0) return; |