diff options
| -rw-r--r-- | sys/arch/hp300/dev/mb89352.c | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/mb89352var.h | 3 | ||||
| -rw-r--r-- | sys/arch/luna88k/dev/mb89352.c | 6 | ||||
| -rw-r--r-- | sys/arch/luna88k/dev/mb89352var.h | 3 |
4 files changed, 6 insertions, 12 deletions
diff --git a/sys/arch/hp300/dev/mb89352.c b/sys/arch/hp300/dev/mb89352.c index a2f2884696a..cdbf3627463 100644 --- a/sys/arch/hp300/dev/mb89352.c +++ b/sys/arch/hp300/dev/mb89352.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352.c,v 1.27 2011/04/25 12:40:52 miod Exp $ */ +/* $OpenBSD: mb89352.c,v 1.28 2011/05/30 20:01:29 miod 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 */ @@ -350,10 +350,8 @@ spc_acb_alloc(void *xsc) mtx_enter(&sc->sc_acb_mtx); acb = TAILQ_FIRST(&sc->free_list); - if (acb) { + if (acb) TAILQ_REMOVE(&sc->free_list, acb, chain); - acb->flags |= ACB_ALLOC; - } mtx_leave(&sc->sc_acb_mtx); return acb; diff --git a/sys/arch/hp300/dev/mb89352var.h b/sys/arch/hp300/dev/mb89352var.h index 29b5a22fcd7..14e9c9ec84a 100644 --- a/sys/arch/hp300/dev/mb89352var.h +++ b/sys/arch/hp300/dev/mb89352var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352var.h,v 1.7 2011/04/02 17:44:43 krw Exp $ */ +/* $OpenBSD: mb89352var.h,v 1.8 2011/05/30 20:01:29 miod Exp $ */ /* $NetBSD: mb89352var.h,v 1.6 2003/08/02 12:48:09 tsutsui Exp $ */ /* NecBSD: mb89352var.h,v 1.4 1998/03/14 07:31:22 kmatsuda Exp */ @@ -83,7 +83,6 @@ struct spc_acb { TAILQ_ENTRY(spc_acb) chain; struct scsi_xfer *xs; /* SCSI xfer ctrl block from above */ int flags; -#define ACB_ALLOC 0x01 #define ACB_NEXUS 0x02 #define ACB_SENSE 0x04 #define ACB_ABORT 0x40 diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c index a4f0dac9ad5..f05e1195400 100644 --- a/sys/arch/luna88k/dev/mb89352.c +++ b/sys/arch/luna88k/dev/mb89352.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352.c,v 1.16 2011/04/03 12:42:36 krw Exp $ */ +/* $OpenBSD: mb89352.c,v 1.17 2011/05/30 20:01:29 miod 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 */ @@ -374,10 +374,8 @@ spc_acb_alloc(xsc) mtx_enter(&sc->sc_acb_mtx); acb = TAILQ_FIRST(&sc->free_list); - if (acb) { + if (acb) TAILQ_REMOVE(&sc->free_list, acb, chain); - acb->flags |= ACB_ALLOC; - } mtx_leave(&sc->sc_acb_mtx); return acb; diff --git a/sys/arch/luna88k/dev/mb89352var.h b/sys/arch/luna88k/dev/mb89352var.h index e2f78ed4c02..ba48c2205cf 100644 --- a/sys/arch/luna88k/dev/mb89352var.h +++ b/sys/arch/luna88k/dev/mb89352var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352var.h,v 1.3 2011/04/03 12:42:36 krw Exp $ */ +/* $OpenBSD: mb89352var.h,v 1.4 2011/05/30 20:01:29 miod Exp $ */ /* $NetBSD: mb89352var.h,v 1.6 2003/08/02 12:48:09 tsutsui Exp $ */ /* NecBSD: mb89352var.h,v 1.4 1998/03/14 07:31:22 kmatsuda Exp */ @@ -83,7 +83,6 @@ struct spc_acb { TAILQ_ENTRY(spc_acb) chain; struct scsi_xfer *xs; /* SCSI xfer ctrl block from above */ int flags; -#define ACB_ALLOC 0x01 #define ACB_NEXUS 0x02 #define ACB_SENSE 0x04 #define ACB_ABORT 0x40 |