diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-08-15 17:50:46 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-08-15 17:50:46 +0000 |
| commit | 737bc203d4fcce9878a88d6efb739d5ad616aae8 (patch) | |
| tree | 44b3968e317c8680dd1c7a29c12c715357450ebe /sys/scsi/cd.c | |
| parent | e635d16b11c511b728951508ef2f713d500874a0 (diff) | |
The last SET()s of CDF_WAITING, SDF_WAITING, and ST_WAITING died in the great
XS_NO_CCB purge of 2017.
Nuke pointless ISSET()/CLR() checks and the #define's.
Diffstat (limited to 'sys/scsi/cd.c')
| -rw-r--r-- | sys/scsi/cd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 289d9f83d46..4bc46cd1aec 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.248 2020/08/11 15:23:57 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.249 2020/08/15 17:50:45 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -101,7 +101,6 @@ struct cd_softc { int sc_flags; #define CDF_ANCIENT 0x10 /* disk is ancient; for cdminphys */ #define CDF_DYING 0x40 /* dying, when deactivated */ -#define CDF_WAITING 0x100 struct scsi_link *sc_link; /* contains targ, lun, etc. */ struct cd_parms { u_int32_t secsize; @@ -602,9 +601,7 @@ cdstart(struct scsi_xfer *xs) scsi_xs_exec(xs); - if (ISSET(sc->sc_flags, CDF_WAITING)) - CLR(sc->sc_flags, CDF_WAITING); - else if (bufq_peek(&sc->sc_bufq)) + if (bufq_peek(&sc->sc_bufq)) scsi_xsh_add(&sc->sc_xsh); } |