The first thing done when XXX_scsi_cmd() returns TRY_AGAIN_LATER is

to set xs->error to XS_BUSY. So it is pointless and misleading to
set xs->error to XS_TIMEOUT, XS_DRIVER_STUFFUP or XS_BUSY just before
returning TRY_AGAIN_LATER.

No functional change.

ok miod@

6 files changed, 6 insertions, 13 deletions

diff --git a/sys/arch/hp300/dev/mb89352.c b/sys/arch/hp300/dev/mb89352.c
index a2a20e222b5..55edb4612d9 100644
--- a/sys/arch/hp300/dev/mb89352.c
+++ b/sys/arch/hp300/dev/mb89352.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mb89352.c,v 1.13 2005/01/04 19:00:02 miod Exp $	*/
+/*	$OpenBSD: mb89352.c,v 1.14 2005/12/03 18:09:36 krw Exp $	*/
 /*	$NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $	*/
 /*	NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp	*/
 
@@ -407,7 +407,6 @@ spc_scsi_cmd(struct scsi_xfer *xs)
 
 	flags = xs->flags;
 	if ((acb = spc_get_acb(sc, flags)) == NULL) {
-		xs->error = XS_DRIVER_STUFFUP;
 		return TRY_AGAIN_LATER;
 	}
 
diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c
index ea6b49ce89d..31a05d64005 100644
--- a/sys/arch/luna88k/dev/mb89352.c
+++ b/sys/arch/luna88k/dev/mb89352.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mb89352.c,v 1.5 2004/12/25 23:02:24 miod Exp $	*/
+/*	$OpenBSD: mb89352.c,v 1.6 2005/12/03 18:09:37 krw Exp $	*/
 /*	$NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $	*/
 /*	NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp	*/
 
@@ -439,7 +439,6 @@ spc_scsi_cmd(xs)
 
 	flags = xs->flags;
 	if ((acb = spc_get_acb(sc, flags)) == NULL) {
-		xs->error = XS_DRIVER_STUFFUP;
 		return TRY_AGAIN_LATER;
 	}
 
diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c
index 967b65b9780..177a690d33b 100644
--- a/sys/arch/mvme68k/dev/sbic.c
+++ b/sys/arch/mvme68k/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.16 2004/12/25 23:02:24 miod Exp $ */
+/*	$OpenBSD: sbic.c,v 1.17 2005/12/03 18:09:37 krw Exp $ */
 /*	$NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $	*/
 
 /*
@@ -387,8 +387,6 @@ sbic_scsicmd(xs)
         Debugger();
 #endif
 #endif
-        xs->error = XS_DRIVER_STUFFUP;
-
         return(TRY_AGAIN_LATER);
     }
 
diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c
index be8be5ebd18..814f3d150d1 100644
--- a/sys/arch/mvme68k/dev/ssh.c
+++ b/sys/arch/mvme68k/dev/ssh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh.c,v 1.13 2005/08/14 12:48:12 miod Exp $ */
+/*	$OpenBSD: ssh.c,v 1.14 2005/12/03 18:09:37 krw Exp $ */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -173,7 +173,6 @@ struct scsi_xfer *xs;
 	splx(s);
 
 	if (acb == NULL) {
-		xs->error = XS_DRIVER_STUFFUP;
 		return (TRY_AGAIN_LATER);
 	}
 
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index fe9c4644dd8..e18c5b077cc 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.18 2004/07/30 22:29:45 miod Exp $ */
+/*	$OpenBSD: vs.c,v 1.19 2005/12/03 18:09:37 krw Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -297,7 +297,6 @@ vs_scsicmd(xs)
 	} else {
 		cqep = vs_getcqe(sc);
 		if (cqep == NULL) {
-			xs->error = XS_DRIVER_STUFFUP;
 			return (TRY_AGAIN_LATER);
 		}
 		iopb = vs_getiopb(sc);
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index 3c570d1384f..67e12f21828 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.55 2005/04/27 14:09:45 miod Exp $	*/
+/*	$OpenBSD: vs.c,v 1.56 2005/12/03 18:09:37 krw Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -370,7 +370,6 @@ vs_scsicmd(struct scsi_xfer *xs)
 	} else {
 		cqep = vs_getcqe(sc);
 		if (cqep == 0) {
-			xs->error = XS_DRIVER_STUFFUP;
 			return (TRY_AGAIN_LATER);
 		}
 		iopb = vs_getiopb(sc);