summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/ic/aac.c4
-rw-r--r--sys/dev/ic/adv.c4
-rw-r--r--sys/dev/ic/adw.c5
-rw-r--r--sys/dev/ic/aic6360.c3
-rw-r--r--sys/dev/ic/ami.c3
-rw-r--r--sys/dev/ic/bha.c4
-rw-r--r--sys/dev/ic/cac.c4
-rw-r--r--sys/dev/ic/dpt.c5
-rw-r--r--sys/dev/ic/gdt_common.c4
-rw-r--r--sys/dev/ic/iha.c3
-rw-r--r--sys/dev/ic/isp_openbsd.c6
-rw-r--r--sys/dev/ic/osiop.c3
-rw-r--r--sys/dev/ic/siop.c7
-rw-r--r--sys/dev/ic/trm.c3
-rw-r--r--sys/dev/ic/twe.c3
-rw-r--r--sys/dev/ic/uha.c3
16 files changed, 16 insertions, 48 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 2ba71c4b898..3ae5e473187 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aac.c,v 1.25 2005/11/18 05:39:10 nate Exp $ */
+/* $OpenBSD: aac.c,v 1.26 2005/12/03 16:53:15 krw Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -2578,7 +2578,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
* We are out of commands, try again
* in a little while.
*/
- xs->error = XS_DRIVER_STUFFUP;
splx(s);
return (TRY_AGAIN_LATER);
}
@@ -2603,7 +2602,6 @@ aac_scsi_cmd(struct scsi_xfer *xs)
{
printf("%s: command timed out\n",
sc->aac_dev.dv_xname);
- xs->error = XS_TIMEOUT;
splx(s);
return (TRY_AGAIN_LATER);
}
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 94ac96ca98d..cc9f47404f3 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.14 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: adv.c,v 1.15 2005/12/03 16:53:15 krw Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -669,7 +669,6 @@ adv_scsi_cmd(xs)
*/
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
/*
@@ -695,7 +694,6 @@ adv_scsi_cmd(xs)
*/
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
/*
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index f2350181f95..d802fd7a511 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.29 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: adw.c,v 1.30 2005/12/03 16:53:15 krw Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -674,7 +674,6 @@ adw_scsi_cmd(xs)
} else {
if(sc->sc_freeze_dev[xs->sc_link->target]) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
@@ -691,7 +690,6 @@ adw_scsi_cmd(xs)
*/
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
/*
@@ -719,7 +717,6 @@ adw_scsi_cmd(xs)
*/
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
/*
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index b169cf2f62f..e60114c9d3e 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic6360.c,v 1.8 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: aic6360.c,v 1.9 2005/12/03 16:53:15 krw Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
#ifdef DDB
@@ -509,7 +509,6 @@ aic_scsi_cmd(xs)
flags = xs->flags;
if ((acb = aic_get_acb(sc, flags)) == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
return TRY_AGAIN_LATER;
}
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index ef16d0c9ac4..d3abc86b914 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.100 2005/11/27 07:28:57 marco Exp $ */
+/* $OpenBSD: ami.c,v 1.101 2005/12/03 16:53:15 krw Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -1563,7 +1563,6 @@ ami_scsi_cmd(struct scsi_xfer *xs)
AMI_DPRINTF(AMI_D_CMD, ("failed %p ", xs));
__asm __volatile(".globl _bpamifail\n_bpamifail:");
if (flags & SCSI_POLL) {
- xs->error = XS_TIMEOUT;
splx(s);
return (TRY_AGAIN_LATER);
} else {
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index 473397ae24f..2e142368308 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bha.c,v 1.7 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: bha.c,v 1.8 2005/12/03 16:53:15 krw Exp $ */
/* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */
#undef BHADEBUG
@@ -1374,7 +1374,6 @@ bha_scsi_cmd(xs)
*/
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
@@ -1399,7 +1398,6 @@ bha_scsi_cmd(xs)
*/
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 3b22d069c97..d6dcfeb5f2a 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cac.c,v 1.20 2005/09/15 05:33:39 krw Exp $ */
+/* $OpenBSD: cac.c,v 1.21 2005/12/03 16:53:15 krw Exp $ */
/* $NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $ */
/*
@@ -684,11 +684,9 @@ cac_scsi_cmd(xs)
target, blockno, flags, xs))) {
if (error == ENOMEM) {
- xs->error = XS_BUSY;
splx(s);
return (TRY_AGAIN_LATER);
} else if (poll) {
- xs->error = XS_TIMEOUT;
splx(s);
return (TRY_AGAIN_LATER);
} else {
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index e63c407bade..15056140ff6 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dpt.c,v 1.10 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: dpt.c,v 1.11 2005/12/03 16:53:16 krw Exp $ */
/* $NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $ */
/*-
@@ -1030,7 +1030,6 @@ dpt_scsi_cmd(xs)
*/
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
@@ -1058,7 +1057,6 @@ dpt_scsi_cmd(xs)
/* If we can't queue, we lose */
if (dontqueue) {
splx(s);
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
@@ -1219,7 +1217,6 @@ dpt_scsi_cmd(xs)
if (dpt_cmd(sc, &ccb->ccb_eata_cp, ccb->ccb_ccbpa, CP_DMA_CMD, 0)) {
printf("%s: dpt_cmd failed\n", sc->sc_dv.dv_xname);
- xs->error = XS_DRIVER_STUFFUP;
dpt_free_ccb(sc, ccb);
return (TRY_AGAIN_LATER);
}
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index edf275dc898..9dea083808f 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.31 2005/12/03 16:22:24 krw Exp $ */
+/* $OpenBSD: gdt_common.c,v 1.32 2005/12/03 16:53:16 krw Exp $ */
/*
* Copyright (c) 1999, 2000, 2003 Niklas Hallqvist. All rights reserved.
@@ -622,7 +622,6 @@ gdt_scsi_cmd(xs)
* We are out of commands, try again in a little while.
*/
if (ccb == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
GDT_UNLOCK_GDT(gdt, lock);
return (TRY_AGAIN_LATER);
}
@@ -673,7 +672,6 @@ gdt_scsi_cmd(xs)
printf("%s: command %d timed out\n",
gdt->sc_dev.dv_xname,
ccb->gc_cmd_index);
- xs->error = XS_TIMEOUT;
return (TRY_AGAIN_LATER);
}
xs->flags |= ITSDONE;
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 3a696587ce5..0fad504aed1 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iha.c,v 1.24 2005/11/05 03:13:29 krw Exp $ */
+/* $OpenBSD: iha.c,v 1.25 2005/12/03 16:53:16 krw Exp $ */
/*-------------------------------------------------------------------------
*
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@@ -277,7 +277,6 @@ iha_scsi_cmd(xs)
if (pScb == NULL) {
/* XXX - different xs->error/return if
* SCSI_POLL/_NOSLEEP? */
- xs->error = XS_BUSY;
return (TRY_AGAIN_LATER);
}
diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c
index fe4625ee47f..ece2a2aa439 100644
--- a/sys/dev/ic/isp_openbsd.c
+++ b/sys/dev/ic/isp_openbsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_openbsd.c,v 1.27 2004/08/02 19:55:45 art Exp $ */
+/* $OpenBSD: isp_openbsd.c,v 1.28 2005/12/03 16:53:16 krw Exp $ */
/*
* Platform (OpenBSD) dependent common attachment code for Qlogic adapters.
*
@@ -318,7 +318,6 @@ ispcmd(XS_T *xs)
*/
if (isp->isp_osinfo.blocked) {
if (xs->flags & SCSI_POLL) {
- xs->error = XS_DRIVER_STUFFUP;
ISP_UNLOCK(isp);
return (TRY_AGAIN_LATER);
}
@@ -393,9 +392,6 @@ isp_polled_cmd(struct ispsoftc *isp, XS_T *xs)
break;
case CMD_RQLATER:
case CMD_EAGAIN:
- if (XS_NOERR(xs)) {
- xs->error = XS_DRIVER_STUFFUP;
- }
result = TRY_AGAIN_LATER;
break;
case CMD_COMPLETE:
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index dc4938838f8..442e6694f80 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: osiop.c,v 1.25 2005/11/21 22:55:43 miod Exp $ */
+/* $OpenBSD: osiop.c,v 1.26 2005/12/03 16:53:16 krw Exp $ */
/* $NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $ */
/*
@@ -404,7 +404,6 @@ osiop_scsicmd(xs)
printf("unable to allocate acb\n");
panic("osiop_scsipi_request");
#endif
- xs->error = XS_DRIVER_STUFFUP;
splx(s);
return (TRY_AGAIN_LATER);
}
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index c0dc9a6ed84..b7a510fc3b0 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siop.c,v 1.42 2005/11/20 22:32:48 krw Exp $ */
+/* $OpenBSD: siop.c,v 1.43 2005/12/03 16:53:16 krw Exp $ */
/* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */
/*
@@ -1356,7 +1356,6 @@ siop_scsicmd(xs)
#endif
siop_cmd = TAILQ_FIRST(&sc->free_list);
if (siop_cmd == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
splx(s);
return(TRY_AGAIN_LATER);
}
@@ -1382,7 +1381,6 @@ siop_scsicmd(xs)
printf("%s: can't malloc memory for "
"target %d\n", sc->sc_c.sc_dev.dv_xname,
target);
- xs->error = XS_DRIVER_STUFFUP;
splx(s);
return(TRY_AGAIN_LATER);
}
@@ -1401,7 +1399,6 @@ siop_scsicmd(xs)
if (siop_target->lunsw == NULL) {
printf("%s: can't alloc lunsw for target %d\n",
sc->sc_c.sc_dev.dv_xname, target);
- xs->error = XS_DRIVER_STUFFUP;
splx(s);
return(TRY_AGAIN_LATER);
}
@@ -1417,7 +1414,6 @@ siop_scsicmd(xs)
printf("%s: can't alloc siop_lun for "
"target %d lun %d\n",
sc->sc_c.sc_dev.dv_xname, target, lun);
- xs->error = XS_DRIVER_STUFFUP;
splx(s);
return(TRY_AGAIN_LATER);
}
@@ -1443,7 +1439,6 @@ siop_scsicmd(xs)
if (error) {
printf("%s: unable to load data DMA map: %d\n",
sc->sc_c.sc_dev.dv_xname, error);
- xs->error = XS_DRIVER_STUFFUP;
splx(s);
return(TRY_AGAIN_LATER);
}
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c
index b3a6a2caac6..2f06c9cb732 100644
--- a/sys/dev/ic/trm.c
+++ b/sys/dev/ic/trm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trm.c,v 1.6 2005/11/05 02:27:40 krw Exp $
+/* $OpenBSD: trm.c,v 1.7 2005/12/03 16:53:16 krw Exp $
* ------------------------------------------------------------
* O.S : OpenBSD
* File Name : trm.c
@@ -396,7 +396,6 @@ trm_scsi_cmd(struct scsi_xfer *xs)
pSRB = trm_GetFreeSRB(sc);
if (pSRB == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
splx(intflag);
return TRY_AGAIN_LATER;
}
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 6596b7d8c2d..3d2f4e77b62 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: twe.c,v 1.24 2005/09/15 05:33:39 krw Exp $ */
+/* $OpenBSD: twe.c,v 1.25 2005/12/03 16:53:16 krw Exp $ */
/*
* Copyright (c) 2000-2002 Michael Shalayeff. All rights reserved.
@@ -921,7 +921,6 @@ twe_scsi_cmd(xs)
TWE_UNLOCK(sc, lock);
TWE_DPRINTF(TWE_D_CMD, ("failed %p ", xs));
if (xs->flags & SCSI_POLL) {
- xs->error = XS_TIMEOUT;
return (TRY_AGAIN_LATER);
} else {
xs->error = XS_DRIVER_STUFFUP;
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index a93f43faa9c..f9a04eab7b6 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.7 2005/11/23 11:30:14 mickey Exp $ */
+/* $OpenBSD: uha.c,v 1.8 2005/12/03 16:53:16 krw Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -376,7 +376,6 @@ uha_scsi_cmd(xs)
*/
flags = xs->flags;
if ((mscp = uha_get_mscp(sc, flags)) == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
mscp->xs = xs;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 07:54:19 +0000