remove useless INUSE references from scsi_xfer->flags; art@ miod@ ok.

7 files changed, 13 insertions, 36 deletions

diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c
index 63062bea3fd..e1d62994030 100644
--- a/sys/arch/mac68k/dev/ncr5380.c
+++ b/sys/arch/mac68k/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380.c,v 1.15 1999/01/11 05:11:35 millert Exp $	*/
+/*	$OpenBSD: ncr5380.c,v 1.16 2001/08/26 00:45:08 fgsch Exp $	*/
 /*	$NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $	*/
 
 /*
@@ -337,10 +337,6 @@ ncr5380_scsi_cmd(struct scsi_xfer *xs)
 		ncr_tprint(reqp, "scsi_cmd: command already done.....\n");
 		xs->flags &= ~ITSDONE;
 	}
-	if (!(flags & INUSE)) {
-		ncr_tprint(reqp, "scsi_cmd: command not in use.....\n");
-		xs->flags |= INUSE;
-	}
 
 #ifdef REAL_DMA
 	/*
diff --git a/sys/arch/mac68k/dev/scsi96.c b/sys/arch/mac68k/dev/scsi96.c
index 9ef2dabd9aa..4fa7a3579d0 100644
--- a/sys/arch/mac68k/dev/scsi96.c
+++ b/sys/arch/mac68k/dev/scsi96.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi96.c,v 1.6 2001/07/04 08:52:46 niklas Exp $	*/
+/*	$OpenBSD: scsi96.c,v 1.7 2001/08/26 00:45:08 fgsch Exp $	*/
 /*	$NetBSD: scsi96.c,v 1.21 1996/10/13 03:21:29 christos Exp $	*/
 
 /*
@@ -194,10 +194,6 @@ ncr53c96_scsi_cmd(struct scsi_xfer * xs)
 		printf("Already done?");
 		xs->flags &= ~ITSDONE;
 	}
-	if (!(flags & INUSE)) {
-		printf("Not in use?");
-		xs->flags |= INUSE;
-	}
 	if (flags & SCSI_RESET) {
 		printf("flags & SCSIRESET.\n");
 		if (!(flags & SCSI_NOSLEEP)) {
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c
index 1fe4b1ee918..399a04d9785 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha1742.c,v 1.15 2001/02/03 07:24:49 mickey Exp $	*/
+/*	$OpenBSD: aha1742.c,v 1.16 2001/08/26 00:45:08 fgsch Exp $	*/
 /*	$NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $	*/
 
 /*
@@ -637,10 +637,6 @@ ahb_done(sc, ecb)
 	 * Otherwise, put the results of the operation
 	 * into the xfer and call whoever started it
 	 */
-	if ((xs->flags & INUSE) == 0) {
-		printf("%s: exiting but not in use!\n", sc->sc_dev.dv_xname);
-		Debugger();
-	}
 	if (ecb->flags & ECB_IMMED) {
 		if (ecb->flags & ECB_IMMED_FAIL)
 			xs->error = XS_DRIVER_STUFFUP;
@@ -958,10 +954,9 @@ ahb_scsi_cmd(xs)
 	 * then we can't allow it to sleep
 	 */
 	flags = xs->flags;
-	if ((flags & (ITSDONE|INUSE)) != INUSE) {
-		printf("%s: done or not in use?\n", sc->sc_dev.dv_xname);
+	if (flags & ITSDONE) {
+		printf("%s: done?\n", sc->sc_dev.dv_xname);
 		xs->flags &= ~ITSDONE;
-		xs->flags |= INUSE;
 	}
 	if ((ecb = ahb_get_ecb(sc, flags)) == NULL) {
 		xs->error = XS_DRIVER_STUFFUP;
diff --git a/sys/dev/ic/ncr5380.c b/sys/dev/ic/ncr5380.c
index 443c43b84cc..ad4dededa27 100644
--- a/sys/dev/ic/ncr5380.c
+++ b/sys/dev/ic/ncr5380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380.c,v 1.3 2001/01/25 03:50:50 todd Exp $	*/
+/*	$OpenBSD: ncr5380.c,v 1.4 2001/08/26 00:45:08 fgsch Exp $	*/
 /*	$NetBSD: ncr5380.c,v 1.3 1995/09/26 21:04:27 pk Exp $	*/
 
 /*
@@ -54,10 +54,6 @@ ncr5380_scsi_cmd(xs)
 		printf("Already done?");
 		xs->flags &= ~ITSDONE;
 	}
-	if ( ! ( flags & INUSE ) ) {
-		printf("Not in use?");
-		xs->flags |= INUSE;
-	}
 
 	s = splbio();
 
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 00b469f8cad..179db398aba 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: seagate.c,v 1.15 2001/06/27 05:44:54 nate Exp $	*/
+/*	$OpenBSD: seagate.c,v 1.16 2001/08/26 00:45:08 fgsch Exp $	*/
 
 /*
  * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -548,10 +548,9 @@ sea_scsi_cmd(xs)
 	SC_DEBUG(sc_link, SDEV_DB2, ("sea_scsi_cmd\n"));
 
 	flags = xs->flags;
-	if ((flags & (ITSDONE|INUSE)) != INUSE) {
-		printf("%s: done or not in use?\n", sea->sc_dev.dv_xname);
+	if (flags & ITSDONE) {
+		printf("%s: done?\n", sea->sc_dev.dv_xname);
 		xs->flags &= ~ITSDONE;
-		xs->flags |= INUSE;
 	}
 	if ((scb = sea_get_scb(sea, flags)) == NULL) {
 		xs->error = XS_DRIVER_STUFFUP;
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index ea1d92453eb..56a37e29828 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr.c,v 1.60 2001/08/25 10:13:30 art Exp $	*/
+/*	$OpenBSD: ncr.c,v 1.61 2001/08/26 00:45:08 fgsch Exp $	*/
 /*	$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $	*/
 
 /**************************************************************************
@@ -1467,7 +1467,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$OpenBSD: ncr.c,v 1.60 2001/08/25 10:13:30 art Exp $\n";
+	"\n$OpenBSD: ncr.c,v 1.61 2001/08/26 00:45:08 fgsch Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -4431,11 +4431,6 @@ static int32_t ncr_start (struct scsi_xfer * xp)
 	*/
 
 	flags = xp->flags;
-	if (!(flags & INUSE)) {
-		printf("%s: ?INUSE?\n", ncr_name (np));
-		xp->flags |= INUSE;
-	};
-
 	if(flags & ITSDONE) {
 		printf("%s: ?ITSDONE?\n", ncr_name (np));
 		xp->flags &= ~ITSDONE;
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index fedfc8f0907..e87094b8eb4 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.49 2001/08/06 20:50:25 miod Exp $	*/
+/*	$OpenBSD: sd.c,v 1.50 2001/08/26 00:45:08 fgsch Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -1254,7 +1254,7 @@ sddump(dev, blkno, va, size)
 		 * to wait for an xs.
 		 */
 		bzero(xs, sizeof(sx));
-		xs->flags |= SCSI_AUTOCONF | INUSE | SCSI_DATA_OUT;
+		xs->flags |= SCSI_AUTOCONF | SCSI_DATA_OUT;
 		xs->sc_link = sd->sc_link;
 		xs->retries = SDRETRIES;
 		xs->timeout = 10000;	/* 10000 millisecs for a disk ! */