Zap all setting of ITSDONE in drivers that don't look at it. Nobody

else cares so it's just noise. Drivers that actually look at ITSDONE
are unchanged.

ok marco@ (for his files) dlg@ beck@

28 files changed, 28 insertions, 124 deletions

diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index 181b052f48a..b94ec4a14df 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.70 2009/12/08 10:18:11 dlg Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.71 2010/01/09 23:15:06 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -467,7 +467,6 @@ atascsi_disk_cmd_done(struct ata_xfer *xa)
 	xs->resid = xa->resid;
 	ata_put_xfer(xa);
 
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 }
 
@@ -706,7 +705,6 @@ atascsi_disk_sync_done(struct ata_xfer *xa)
 
 	ata_put_xfer(xa);
 
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 }
 
@@ -842,7 +840,6 @@ atascsi_atapi_cmd_done(struct ata_xfer *xa)
 	xs->resid = xa->resid;
 	ata_put_xfer(xa);
 
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 }
 
diff --git a/sys/dev/i2o/ioprbs.c b/sys/dev/i2o/ioprbs.c
index fc11395eecb..38fca418deb 100644
--- a/sys/dev/i2o/ioprbs.c
+++ b/sys/dev/i2o/ioprbs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioprbs.c,v 1.18 2009/11/22 14:14:10 krw Exp $	*/
+/*	$OpenBSD: ioprbs.c,v 1.19 2010/01/09 23:15:06 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -432,7 +432,6 @@ ioprbs_scsi_cmd(xs)
 		case VERIFY:
 #endif
 			ioprbs_internal_cache_cmd(xs);
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 
@@ -440,7 +439,6 @@ ioprbs_scsi_cmd(xs)
 			DPRINTF(("PREVENT/ALLOW "));
 			/* XXX Not yet implemented */
 			xs->error = XS_NOERROR;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 
@@ -448,7 +446,6 @@ ioprbs_scsi_cmd(xs)
 			DPRINTF(("SYNCHRONIZE_CACHE "));
 			/* XXX Not yet implemented */
 			xs->error = XS_NOERROR;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 
@@ -456,7 +453,6 @@ ioprbs_scsi_cmd(xs)
 			DPRINTF(("unknown opc %d ", xs->cmd->opcode));
 			/* XXX Not yet implemented */
 			xs->error = XS_DRIVER_STUFFUP;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 
@@ -491,7 +487,6 @@ ioprbs_scsi_cmd(xs)
 					 * sense too.
 					 */
 					xs->error = XS_DRIVER_STUFFUP;
-					xs->flags |= ITSDONE;
 					scsi_done(xs);
 					goto ready;
 				}
@@ -523,7 +518,6 @@ ioprbs_scsi_cmd(xs)
 					    sc->sc_dv.dv_xname);
 					return (NO_CCB);
 				}
-				xs->flags |= ITSDONE;
 				scsi_done(xs);
 #endif
 			}
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 76c055b3352..3e6ff08d841 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.41 2009/11/22 14:14:10 krw Exp $	*/
+/*	$OpenBSD: aac.c,v 1.42 2010/01/09 23:15:06 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -1107,7 +1107,6 @@ aac_bio_complete(struct aac_command *cm)
 
 	xs->error = status == ST_OK? XS_NOERROR : XS_DRIVER_STUFFUP;
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 	splx(s);
 }
@@ -2095,7 +2094,6 @@ aac_command_timeout(struct aac_command *cm)
 		struct scsi_xfer *xs = cm->cm_private;
 		int s = splbio();
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		splx(s);
 
@@ -2523,7 +2521,6 @@ aac_raw_scsi_cmd(struct scsi_xfer *xs)
 
 	/* XXX Not yet implemented */
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	s = splbio();
 	scsi_done(xs);
 	splx(s);
@@ -2553,7 +2550,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
 		 * faked sense too.
 		 */
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		splx(s);
 		return (COMPLETE);
@@ -2576,7 +2572,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
 	case VERIFY:
 #endif
 		aac_internal_cache_cmd(xs);
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		goto ready;
 
@@ -2584,7 +2579,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
 		AAC_DPRINTF(AAC_D_CMD, ("PREVENT/ALLOW "));
 		/* XXX Not yet implemented */
 		xs->error = XS_NOERROR;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		goto ready;
 
@@ -2592,7 +2586,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
 		AAC_DPRINTF(AAC_D_CMD, ("SYNCHRONIZE_CACHE "));
 		/* XXX Not yet implemented */
 		xs->error = XS_NOERROR;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		goto ready;
 
@@ -2600,7 +2593,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
 		AAC_DPRINTF(AAC_D_CMD, ("unknown opc %#x ", xs->cmd->opcode));
 		/* XXX Not yet implemented */
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		goto ready;
 
@@ -2637,7 +2629,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
 			 * sense too.
 			 */
 			xs->error = XS_DRIVER_STUFFUP;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 		}
@@ -2676,7 +2667,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
 				splx(s);
 				return (NO_CCB);
 			}
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 		}
 	}
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 185499d0a10..5c0d7d85bed 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.198 2009/12/06 12:31:10 chl Exp $	*/
+/*	$OpenBSD: ami.c,v 1.199 2010/01/09 23:15:06 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -1195,7 +1195,6 @@ ami_done_pt(struct ami_softc *sc, struct ami_ccb *ccb)
 
 	timeout_del(&xs->stimeout);
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 
 	if (ccb->ccb_flags & AMI_CCB_F_ERR)
 		xs->error = XS_DRIVER_STUFFUP;
@@ -1234,7 +1233,6 @@ ami_done_xs(struct ami_softc *sc, struct ami_ccb *ccb)
 
 	timeout_del(&xs->stimeout);
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 
 	if (ccb->ccb_flags & AMI_CCB_F_ERR)
 		xs->error = XS_DRIVER_STUFFUP;
@@ -1253,7 +1251,6 @@ ami_done_flush(struct ami_softc *sc, struct ami_ccb *ccb)
 	if (ccb->ccb_flags & AMI_CCB_F_ERR) {
 		xs->error = XS_DRIVER_STUFFUP;
 		xs->resid = 0;
-		xs->flags |= ITSDONE;
 
 		ami_put_ccb(ccb);
 		scsi_done(xs);
@@ -1274,7 +1271,6 @@ ami_done_sysflush(struct ami_softc *sc, struct ami_ccb *ccb)
 
 	timeout_del(&xs->stimeout);
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 	if (ccb->ccb_flags & AMI_CCB_F_ERR)
 		xs->error = XS_DRIVER_STUFFUP;
 
@@ -1346,7 +1342,6 @@ ami_scsi_raw_cmd(struct scsi_xfer *xs)
 		xs->sense.flags = SKEY_ILLEGAL_REQUEST;
 		xs->sense.add_sense_code = 0x20; /* illcmd, 0x24 illfield */
 		xs->error = XS_SENSE;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1382,7 +1377,6 @@ ami_scsi_raw_cmd(struct scsi_xfer *xs)
 	if (ami_load_ptmem(sc, ccb, xs->data, xs->datalen,
 	    xs->flags & SCSI_DATA_IN, xs->flags & SCSI_NOSLEEP) != 0) {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		ami_put_ccb(ccb);
 		scsi_done(xs);
@@ -1468,7 +1462,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		AMI_DPRINTF(AMI_D_CMD, ("no target %d ", target));
 		/* XXX should be XS_SENSE and sense filled out */
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1517,7 +1510,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		AMI_DPRINTF(AMI_D_CMD, ("opc %d tgt %d ", xs->cmd->opcode,
 		    target));
 		xs->error = XS_NOERROR;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1534,7 +1526,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		ami_copy_internal_data(xs, &sd, sizeof(sd));
 
 		xs->error = XS_NOERROR;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1555,7 +1546,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		ami_copy_internal_data(xs, &inq, sizeof(inq));
 
 		xs->error = XS_NOERROR;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1569,7 +1559,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		ami_copy_internal_data(xs, &rcd, sizeof(rcd));
 
 		xs->error = XS_NOERROR;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1580,7 +1569,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		    xs->cmd->opcode, target));
 
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1603,7 +1591,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		printf("%s: out of bounds %u-%u >= %u\n", DEVNAME(sc),
 		    blockno, blockcnt, sc->sc_hdr[target].hd_size);
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1636,7 +1623,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 			printf("error %d loading dma map\n", error);
 
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		ami_put_ccb(ccb);
 		scsi_done(xs);
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 4ca8b8e6269..6cc4c4f1e4d 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.33 2009/11/22 14:14:10 krw Exp $	*/
+/*	$OpenBSD: cac.c,v 1.34 2010/01/09 23:15:06 krw Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -507,7 +507,6 @@ cac_ccb_done(struct cac_softc *sc, struct cac_ccb *ccb)
 		else
 			xs->resid = 0;
 
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 	}
 }
@@ -599,7 +598,6 @@ cac_scsi_cmd(xs)
 
 	if (target >= sc->sc_nunits || link->lun != 0) {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 5dff3734e06..c9c8053b58c 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciss.c,v 1.39 2010/01/09 06:35:11 krw Exp $	*/
+/*	$OpenBSD: ciss.c,v 1.40 2010/01/09 23:15:06 krw Exp $	*/
 
 /*
  * Copyright (c) 2005,2006 Michael Shalayeff
@@ -685,7 +685,6 @@ ciss_done(struct ciss_ccb *ccb)
 
 	if (xs) {
 		xs->resid = 0;
-		xs->flags |= ITSDONE;
 		CISS_DPRINTF(CISS_D_CMD, ("scsi_done(%p) ", xs));
 		scsi_done(xs);
 	}
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index a015bd61cf6..46bae9d9016 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dpt.c,v 1.22 2009/11/22 14:14:10 krw Exp $	*/
+/*	$OpenBSD: dpt.c,v 1.23 2010/01/09 23:15:06 krw Exp $	*/
 /*	$NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $	*/
 
 /*-
@@ -854,7 +854,6 @@ dpt_done_ccb(sc, ccb)
 	scsipi_done(xs);
 #endif /* __NetBSD__ */
 #ifdef __OpenBSD__
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 #endif /* __OpenBSD__ */
 }
@@ -903,7 +902,6 @@ dpt_scsi_cmd(xs)
 	/* Cmds must be no more than 12 bytes for us */
 	if (xs->cmdlen > 12) {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		splx(s);
 		return (COMPLETE);
@@ -917,7 +915,6 @@ dpt_scsi_cmd(xs)
 		if ((xs->flags & SCSI_RESET) != 0) {
 #endif /* __OpenBSD__ */
 			xs->error = XS_DRIVER_STUFFUP;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			splx(s);
 			return (COMPLETE);
@@ -1005,7 +1002,6 @@ dpt_scsi_cmd(xs)
 		
 			xs->error = XS_DRIVER_STUFFUP;
 			dpt_free_ccb(sc, ccb);
-			xs->flags |= ITSDONE;
 			s = splbio();
 			scsi_done(xs);
 			splx(s);
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index e8bd456731f..514dad0fa00 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_common.c,v 1.46 2009/11/22 14:14:10 krw Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.47 2010/01/09 23:15:06 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist.  All rights reserved.
@@ -607,7 +607,6 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 		 * faked sense too.
 		 */
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		splx(s);
 		return (COMPLETE);
@@ -644,7 +643,6 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 		case VERIFY:
 #endif
 			gdt_internal_cache_cmd(xs);
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 
@@ -652,7 +650,6 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 			GDT_DPRINTF(GDT_D_CMD, ("PREVENT/ALLOW "));
 			/* XXX Not yet implemented */
 			xs->error = XS_NOERROR;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 
@@ -661,7 +658,6 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 			    ("unknown opc %d ", xs->cmd->opcode));
 			/* XXX Not yet implemented */
 			xs->error = XS_DRIVER_STUFFUP;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 			goto ready;
 
@@ -702,7 +698,6 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 					 * sense too.
 					 */
 					xs->error = XS_DRIVER_STUFFUP;
-					xs->flags |= ITSDONE;
 					scsi_done(xs);
 					goto ready;
 				}
@@ -744,7 +739,6 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 
 					gdt_free_ccb(sc, ccb);
 					xs->error = XS_DRIVER_STUFFUP;
-					xs->flags |= ITSDONE;
 					scsi_done(xs);
 					goto ready;
 				}
@@ -765,7 +759,6 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 					    ccb->gc_cmd_index);
 					return (NO_CCB);
 				}
-				xs->flags |= ITSDONE;
 				scsi_done(xs);
 			}
 		}
@@ -1030,7 +1023,6 @@ gdt_raw_scsi_cmd(struct scsi_xfer *xs)
 	}
 
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	s = splbio();
 	scsi_done(xs);
 	gdt_free_ccb(sc, ccb);
@@ -1174,7 +1166,6 @@ gdt_intr(void *arg)
 
 	switch (sync_val) {
 	case 1:
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 		break;
 
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 16ea2dfa97e..37357603a19 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.98 2010/01/04 08:04:43 dlg Exp $ */
+/* $OpenBSD: mfi.c,v 1.99 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -922,7 +922,6 @@ mfi_scsi_xs_done(struct mfi_ccb *ccb)
 	}
 
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 
 	mfi_put_ccb(ccb);
 	scsi_done(xs);
@@ -1086,7 +1085,6 @@ mfi_scsi_cmd(struct scsi_xfer *xs)
 		}
 
 		mfi_put_ccb(ccb);
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1103,7 +1101,6 @@ mfi_scsi_cmd(struct scsi_xfer *xs)
 stuffup:
 	xs->error = XS_DRIVER_STUFFUP;
 complete:
-	xs->flags |= ITSDONE;
 	s = splbio();
 	scsi_done(xs);
 	splx(s);
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index df807c1d643..be8b4864e99 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpi.c,v 1.132 2010/01/03 07:47:20 dlg Exp $ */
+/*	$OpenBSD: mpi.c,v 1.133 2010/01/09 23:15:06 krw Exp $ */
 
 /*
  * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -1227,7 +1227,6 @@ mpi_scsi_cmd(struct scsi_xfer *xs)
 		xs->sense.flags = SKEY_ILLEGAL_REQUEST;
 		xs->sense.add_sense_code = 0x20;
 		xs->error = XS_SENSE;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -1289,7 +1288,6 @@ mpi_scsi_cmd(struct scsi_xfer *xs)
 
 	if (mpi_load_xs(ccb) != 0) {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		mpi_put_ccb(sc, ccb);
 		s = splbio();
 		scsi_done(xs);
@@ -1302,7 +1300,6 @@ mpi_scsi_cmd(struct scsi_xfer *xs)
 	if (xs->flags & SCSI_POLL) {
 		if (mpi_poll(sc, ccb, xs->timeout) != 0) {
 			xs->error = XS_DRIVER_STUFFUP;
-			xs->flags |= ITSDONE;
 			s = splbio();
 			scsi_done(xs);
 			splx(s);
@@ -1335,7 +1332,6 @@ mpi_scsi_cmd_done(struct mpi_ccb *ccb)
 	/* timeout_del */
 	xs->error = XS_NOERROR;
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 
 	if (ccb->ccb_rcb == NULL) {
 		/* no scsi error, we're ok so drop out early */
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index 57750b4e413..d19cd3d670e 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380sbc.c,v 1.22 2009/11/01 23:06:03 fgsch Exp $	*/
+/*	$OpenBSD: ncr5380sbc.c,v 1.23 2010/01/09 23:15:06 krw Exp $	*/
 /*	$NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $	*/
 
 /*
@@ -803,7 +803,6 @@ finish:
 	sc->sc_ncmds--;
 
 	/* Tell common SCSI code it is done. */
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 
 	sc->sc_state = NCR_IDLE;
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 511abb29d1f..1c633747cd6 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twe.c,v 1.32 2009/11/22 14:14:10 krw Exp $	*/
+/*	$OpenBSD: twe.c,v 1.33 2010/01/09 23:15:06 krw Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Michael Shalayeff.  All rights reserved.
@@ -737,7 +737,6 @@ twe_done(sc, ccb)
 
 	if (xs) {
 		xs->resid = 0;
-		xs->flags |= ITSDONE;
 		scsi_done(xs);
 	}
 	TWE_UNLOCK(sc, lock);
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 70bb322822e..90351ac3218 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha.c,v 1.14 2009/09/04 04:57:14 miod Exp $	*/
+/*	$OpenBSD: uha.c,v 1.15 2010/01/09 23:15:06 krw Exp $	*/
 /*	$NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $	*/
 
 #undef UHADEBUG
@@ -329,7 +329,6 @@ uha_done(sc, mscp)
 			xs->resid = 0;
 	}
 	uha_free_mscp(sc, mscp);
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 }
 
@@ -492,7 +491,6 @@ uha_scsi_cmd(xs)
 
 bad:
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	s = splbio();
 	scsi_done(xs);
 	splx(s);
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c
index a701b70fb70..39e38a68081 100644
--- a/sys/dev/pci/arc.c
+++ b/sys/dev/pci/arc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc.c,v 1.79 2009/08/13 11:10:27 dlg Exp $ */
+/*	$OpenBSD: arc.c,v 1.80 2010/01/09 23:15:06 krw Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -726,7 +726,6 @@ arc_scsi_cmd(struct scsi_xfer *xs)
 		xs->sense.flags = SKEY_ILLEGAL_REQUEST;
 		xs->sense.add_sense_code = 0x20;
 		xs->error = XS_SENSE;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -738,7 +737,6 @@ arc_scsi_cmd(struct scsi_xfer *xs)
 	splx(s);
 	if (ccb == NULL) {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -749,7 +747,6 @@ arc_scsi_cmd(struct scsi_xfer *xs)
 
 	if (arc_load_xs(ccb) != 0) {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		arc_put_ccb(sc, ccb);
 		scsi_done(xs);
@@ -790,7 +787,6 @@ arc_scsi_cmd(struct scsi_xfer *xs)
 		rv = COMPLETE;
 		if (arc_complete(sc, ccb, xs->timeout) != 0) {
 			xs->error = XS_DRIVER_STUFFUP;
-			xs->flags |= ITSDONE;
 			scsi_done(xs);
 		}
 	}
@@ -849,9 +845,6 @@ arc_scsi_cmd_done(struct arc_softc *sc, struct arc_ccb *ccb, u_int32_t reg)
 		bus_dmamap_unload(sc->sc_dmat, ccb->ccb_dmamap);
 	}
 
-	/* timeout_del */
-	xs->flags |= ITSDONE;
-
 	if (reg & ARC_RA_REPLY_QUEUE_ERR) {
 		cmd = &ccb->ccb_cmd->cmd;
 
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c
index b1fc046249c..d65b61cc079 100644
--- a/sys/dev/pci/ips.c
+++ b/sys/dev/pci/ips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ips.c,v 1.93 2009/03/23 17:40:56 grange Exp $	*/
+/*	$OpenBSD: ips.c,v 1.94 2010/01/09 23:15:07 krw Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -1547,7 +1547,6 @@ ips_done_xs(struct ips_softc *sc, struct ips_ccb *ccb)
 
 	xs->resid = 0;
 	xs->error = ips_error_xs(sc, ccb);
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 }
 
@@ -1589,7 +1588,6 @@ ips_done_pt(struct ips_softc *sc, struct ips_ccb *ccb)
 			xs->error = XS_DRIVER_STUFFUP;
 	}
 
-	xs->flags |= ITSDONE;
 	scsi_done(xs);
 }
 
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index 56a61681daa..20ca594b492 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpii.c,v 1.5 2009/12/01 00:09:03 bluhm Exp $ */
+/* $OpenBSD: mpii.c,v 1.6 2010/01/09 23:15:07 krw Exp $ */
 /*
  * Copyright (c) James Giannoules
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -4838,7 +4838,6 @@ mpii_scsi_cmd(struct scsi_xfer *xs)
 		xs->sense.flags = SKEY_ILLEGAL_REQUEST;
 		xs->sense.add_sense_code = 0x20;
 		xs->error = XS_SENSE;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -4911,7 +4910,6 @@ mpii_scsi_cmd(struct scsi_xfer *xs)
 
 	if (mpii_load_xs(ccb) != 0) {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		mpii_put_ccb(sc, ccb);
 		scsi_done(xs);
@@ -4937,7 +4935,6 @@ mpii_scsi_cmd(struct scsi_xfer *xs)
 	if (xs->flags & SCSI_POLL) {
 		if (mpii_poll(sc, ccb, xs->timeout) != 0) {
 			xs->error = XS_DRIVER_STUFFUP;
-			xs->flags |= ITSDONE;
 			s = splbio();
 			scsi_done(xs);
 			splx(s);
@@ -4975,7 +4972,6 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
 	/* timeout_del */
 	xs->error = XS_NOERROR;
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 
 	if (ccb->ccb_rcb == NULL) {
 		/* no scsi error, we're ok so drop out early */
diff --git a/sys/dev/pci/qli_pci.c b/sys/dev/pci/qli_pci.c
index 586ce5e9692..1630fa9d0a0 100644
--- a/sys/dev/pci/qli_pci.c
+++ b/sys/dev/pci/qli_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qli_pci.c,v 1.14 2009/08/17 18:11:37 miod Exp $ */
+/* $OpenBSD: qli_pci.c,v 1.15 2010/01/09 23:15:07 krw Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2007 David Collins <dave@davec.name>
@@ -1015,7 +1015,6 @@ qli_scsi_cmd(struct scsi_xfer *xs)
 
 stuffup:
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	s = splbio();
 	scsi_done(xs);
 	splx(s);
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 2f1a1bcff5d..8b45414a754 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_scsi.c,v 1.19 2009/10/03 18:42:36 kettenis Exp $	*/
+/*	$OpenBSD: sdmmc_scsi.c,v 1.20 2010/01/09 23:15:07 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -306,7 +306,6 @@ sdmmc_scsi_cmd(struct scsi_xfer *xs)
 		    DEVNAME(sc), link->target));
 		/* XXX should be XS_SENSE and sense filled out */
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 		s = splbio();
 		scsi_done(xs);
 		splx(s);
@@ -477,7 +476,6 @@ sdmmc_done_xs(struct sdmmc_ccb *ccb)
 	    curproc ? curproc->p_comm : "", xs->error));
 
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 
 	if (ISSET(ccb->ccb_flags, SDMMC_CCB_F_ERR))
 		xs->error = XS_DRIVER_STUFFUP;
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 4322c997285..57d6649b27a 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.188 2009/12/31 14:00:45 jsing Exp $ */
+/* $OpenBSD: softraid.c,v 1.189 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -1934,7 +1934,6 @@ stuffup:
 		bzero(&sd->sd_scsi_sense, sizeof(sd->sd_scsi_sense));
 	} else {
 		xs->error = XS_DRIVER_STUFFUP;
-		xs->flags |= ITSDONE;
 	}
 complete:
 	if (wu)
diff --git a/sys/dev/softraid_aoe.c b/sys/dev/softraid_aoe.c
index a6ae5b78687..a2adf94e62d 100644
--- a/sys/dev/softraid_aoe.c
+++ b/sys/dev/softraid_aoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_aoe.c,v 1.12 2009/12/15 13:19:37 jsing Exp $ */
+/* $OpenBSD: softraid_aoe.c,v 1.13 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2008 Ted Unangst <tedu@openbsd.org>
  * Copyright (c) 2008 Marco Peereboom <marco@openbsd.org>
@@ -539,7 +539,6 @@ sr_aoe_input(struct aoe_handler *ah, struct mbuf *m)
 			xs->error = XS_NOERROR;
 
 		xs->resid = 0;
-		xs->flags |= ITSDONE;
 
 		if (0) /* XXX */ TAILQ_FOREACH(wup, &sd->sd_wu_pendq, swu_link) {
 			if (wu == wup) {
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index 0ee5a8a4cee..7d7b9285a61 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.46 2009/12/31 14:42:31 jsing Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.47 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -1311,7 +1311,6 @@ sr_crypto_finish_io(struct sr_workunit *wu)
 	    DEVNAME(sc), wu, xs);
 
 	xs->resid = 0;
-	xs->flags |= ITSDONE;
 
 	TAILQ_FOREACH(ccb, &wu->swu_ccb, ccb_link) {
 		if (ccb->ccb_opaque == NULL)
diff --git a/sys/dev/softraid_raid0.c b/sys/dev/softraid_raid0.c
index e202010eff5..9fe048f3b63 100644
--- a/sys/dev/softraid_raid0.c
+++ b/sys/dev/softraid_raid0.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid0.c,v 1.18 2009/12/15 13:19:37 jsing Exp $ */
+/* $OpenBSD: softraid_raid0.c,v 1.19 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us>
  *
@@ -431,7 +431,6 @@ sr_raid0_intr(struct buf *bp)
 
 		xs->error = XS_NOERROR;
 		xs->resid = 0;
-		xs->flags |= ITSDONE;
 
 		pend = 0;
 		TAILQ_FOREACH(wup, &sd->sd_wu_pendq, swu_link) {
@@ -468,7 +467,6 @@ sr_raid0_intr(struct buf *bp)
 	return;
 bad:
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	sr_wu_put(wu);
 	sr_scsi_done(sd, xs);
 	splx(s);
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c
index cab77bc65a0..343e390a027 100644
--- a/sys/dev/softraid_raid1.c
+++ b/sys/dev/softraid_raid1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid1.c,v 1.21 2009/12/15 13:19:37 jsing Exp $ */
+/* $OpenBSD: softraid_raid1.c,v 1.22 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  *
@@ -575,7 +575,6 @@ sr_raid1_intr(struct buf *bp)
 
 		xs->error = XS_NOERROR;
 		xs->resid = 0;
-		xs->flags |= ITSDONE;
 
 		pend = 0;
 		TAILQ_FOREACH(wup, &sd->sd_wu_pendq, swu_link) {
@@ -624,7 +623,6 @@ retry:
 	return;
 bad:
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	if (wu->swu_flags & SR_WUF_REBUILD) {
 		wu->swu_flags |= SR_WUF_REBUILDIOCOMP;
 		wakeup(wu);
diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c
index 70f08400231..8af25956f79 100644
--- a/sys/dev/softraid_raid6.c
+++ b/sys/dev/softraid_raid6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid6.c,v 1.10 2009/12/15 13:19:37 jsing Exp $ */
+/* $OpenBSD: softraid_raid6.c,v 1.11 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -882,7 +882,6 @@ sr_raid6_intr(struct buf *bp)
 		if (xs != NULL) {
 			xs->error = XS_NOERROR;
 			xs->resid = 0;
-			xs->flags |= ITSDONE;
 		}
 
 		pend = 0;
@@ -934,7 +933,6 @@ retry:
 	return;
 bad:
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	if (wu->swu_flags & SR_WUF_REBUILD) {
 		wu->swu_flags |= SR_WUF_REBUILDIOCOMP;
 		wakeup(wu);
diff --git a/sys/dev/softraid_raidp.c b/sys/dev/softraid_raidp.c
index 930e6bc31b3..fba085e59cf 100644
--- a/sys/dev/softraid_raidp.c
+++ b/sys/dev/softraid_raidp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raidp.c,v 1.13 2009/12/15 13:19:37 jsing Exp $ */
+/* $OpenBSD: softraid_raidp.c,v 1.14 2010/01/09 23:15:06 krw Exp $ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -633,7 +633,6 @@ sr_raidp_intr(struct buf *bp)
 		if (xs != NULL) {
 			xs->error = XS_NOERROR;
 			xs->resid = 0;
-			xs->flags |= ITSDONE;
 		}
 
 		pend = 0;
@@ -684,7 +683,6 @@ retry:
 	return;
 bad:
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	if (wu->swu_flags & SR_WUF_REBUILD) {
 		wu->swu_flags |= SR_WUF_REBUILDIOCOMP;
 		wakeup(wu);
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 8ba3073ee9f..e26114ca342 100644
--- a/sys/dev/usb/umass_scsi.c
+++ b/sys/dev/usb/umass_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass_scsi.c,v 1.25 2009/07/02 18:50:37 krw Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.26 2010/01/09 23:15:07 krw Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -262,7 +262,6 @@ umass_scsi_cmd(struct scsi_xfer *xs)
 
 	/* Return if command finishes early. */
  done:
-	xs->flags |= ITSDONE;
 	if (xs->flags & SCSI_POLL)
 		rslt = COMPLETE;
 	else
@@ -370,7 +369,6 @@ umass_scsi_cb(struct umass_softc *sc, void *priv, int residue, int status)
 	if (xs->flags & SCSI_POLL)
 		return;
 
-	xs->flags |= ITSDONE;
 
 	DPRINTF(UDMASS_CMD,("umass_scsi_cb: at %lu.%06lu: return error=%d, "
 			    "status=0x%x resid=%d\n",
@@ -412,8 +410,6 @@ umass_scsi_sense_cb(struct umass_softc *sc, void *priv, int residue,
 		break;
 	}
 
-	xs->flags |= ITSDONE;
-
 	DPRINTF(UDMASS_CMD,("umass_scsi_sense_cb: return xs->error=%d, "
 		"xs->flags=0x%x xs->resid=%d\n", xs->error, xs->status,
 		xs->resid));
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index 95fdd57c06e..2e1b136ad72 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usscanner.c,v 1.29 2009/10/13 19:33:19 pirofti Exp $	*/
+/*	$OpenBSD: usscanner.c,v 1.30 2010/01/09 23:15:07 krw Exp $	*/
 /*	$NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $	*/
 
 /*
@@ -87,7 +87,6 @@ int	usscannerdebug = 0;
 #define show_scsipi_cmd         show_scsi_cmd
 #define xs_control		flags
 #define xs_status		status
-#define XS_STS_DONE		ITSDONE
 #define XS_CTL_POLL		SCSI_POLL
 
 #define USSCANNER_CONFIG_NO		1
@@ -488,7 +487,6 @@ usscanner_intr_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 	sc->sc_state = UAS_IDLE;
 
-	sc->sc_xs->xs_control |= XS_STS_DONE;
 	s = splbio();
 	scsipi_done(sc->sc_xs);
 	splx(s);
@@ -765,7 +763,6 @@ usscanner_scsipi_cmd(struct scsipi_xfer *xs)
 
  done:
 	sc->sc_state = UAS_IDLE;
-	xs->xs_control |= XS_STS_DONE;
 	s = splbio();
 	scsipi_done(xs);
 	splx(s);
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index 2937475ae32..a6874058a60 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscsi.c,v 1.4 2009/11/09 17:53:39 nicm Exp $ */
+/*	$OpenBSD: vscsi.c,v 1.5 2010/01/09 23:15:06 krw Exp $ */
 
 /*
  * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -213,7 +213,6 @@ vscsi_xs_stuffup(struct scsi_xfer *xs)
 	int				s;
 
 	xs->error = XS_DRIVER_STUFFUP;
-	xs->flags |= ITSDONE;
 	s = splbio();
 	scsi_done(xs);
 	splx(s);
@@ -430,7 +429,6 @@ vscsi_t2i(struct vscsi_softc *sc, struct vscsi_ioc_t2i *t2i)
 
 	polled = ISSET(xs->flags, SCSI_POLL);
 
-	xs->flags |= ITSDONE;
 	s = splbio();
 	scsi_done(xs);
 	splx(s);