diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c
index 6e4204b2b8a9..3c551eb5b0be 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha1742.c,v 1.48 1995/08/12 20:31:18 mycroft Exp $	*/
+/*	$NetBSD: aha1742.c,v 1.49 1995/08/12 23:01:31 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -708,9 +708,9 @@ ahb_free_ecb(ahb, ecb, flags)
 	struct ahb_ecb *ecb;
 	int flags;
 {
-	int opri;
+	int s;
 
-	opri = splbio();
+	s = splbio();
 
 	ecb->flags = ECB_FREE;
 	TAILQ_INSERT_HEAD(&ahb->free_ecb, ecb, chain);
@@ -722,7 +722,7 @@ ahb_free_ecb(ahb, ecb, flags)
 	if (!ecb->chain.tqe_next)
 		wakeup(&ahb->free_ecb);
 
-	splx(opri);
+	splx(s);
 }
 
 /*
@@ -736,11 +736,11 @@ ahb_get_ecb(ahb, flags)
 	struct ahb_softc *ahb;
 	int flags;
 {
-	int opri;
+	int s;
 	struct ahb_ecb *ecb;
 	int hashnum;
 
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * If we can and have to, sleep waiting for one to come free
@@ -776,7 +776,7 @@ ahb_get_ecb(ahb, flags)
 		}
 	}
 
-	splx(opri);
+	splx(s);
 	return ecb;
 }
 
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index e172a0f496e5..a87d4570115c 100644
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha1542.c,v 1.48 1995/08/12 20:31:21 mycroft Exp $	*/
+/*	$NetBSD: aha1542.c,v 1.49 1995/08/12 23:00:43 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -719,9 +719,9 @@ aha_free_ccb(aha, ccb, flags)
 	struct aha_ccb *ccb;
 	int flags;
 {
-	int opri;
+	int s;
 
-	opri = splbio();
+	s = splbio();
 
 	ccb->flags = CCB_FREE;
 	TAILQ_INSERT_HEAD(&aha->free_ccb, ccb, chain);
@@ -733,7 +733,7 @@ aha_free_ccb(aha, ccb, flags)
 	if (!ccb->chain.tqe_next)
 		wakeup(&aha->free_ccb);
 
-	splx(opri);
+	splx(s);
 }
 
 /*
@@ -744,11 +744,11 @@ aha_get_ccb(aha, flags)
 	struct aha_softc *aha;
 	int flags;
 {
-	int opri;
+	int s;
 	struct aha_ccb *ccb;
 	int hashnum;
 
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * If we can and have to, sleep waiting for one
@@ -784,7 +784,7 @@ aha_get_ccb(aha, flags)
 		tsleep(&aha->free_ccb, PRIBIO, "ahaccb", 0);
 	}
 
-	splx(opri);
+	splx(s);
 	return ccb;
 }
 
diff --git a/sys/dev/isa/bt742a.c b/sys/dev/isa/bt742a.c
index 9efb3dd1bfaf..47ee2fb1a397 100644
--- a/sys/dev/isa/bt742a.c
+++ b/sys/dev/isa/bt742a.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt742a.c,v 1.45 1995/08/12 20:31:27 mycroft Exp $	*/
+/*	$NetBSD: bt742a.c,v 1.46 1995/08/12 23:00:47 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -746,9 +746,9 @@ bt_free_ccb(bt, ccb, flags)
 	struct bt_ccb *ccb;
 	int flags;
 {
-	int opri;
+	int s;
 
-	opri = splbio();
+	s = splbio();
 
 	ccb->flags = CCB_FREE;
 	TAILQ_INSERT_HEAD(&bt->free_ccb, ccb, chain);
@@ -760,7 +760,7 @@ bt_free_ccb(bt, ccb, flags)
 	if (!ccb->chain.tqe_next)
 		wakeup(&bt->free_ccb);
 
-	splx(opri);
+	splx(s);
 }
 
 /*
@@ -774,11 +774,11 @@ bt_get_ccb(bt, flags)
 	struct bt_softc *bt;
 	int flags;
 {
-	int opri;
+	int s;
 	struct bt_ccb *ccb;
 	int hashnum;
 
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * If we can and have to, sleep waiting for one to come free
@@ -814,7 +814,7 @@ bt_get_ccb(bt, flags)
 		tsleep(&bt->free_ccb, PRIBIO, "btccb", 0);
 	}
 
-	splx(opri);
+	splx(s);
 	return ccb;
 }
 
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index 02243da25c6c..f8a417348881 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ultra14f.c,v 1.52 1995/08/12 20:31:30 mycroft Exp $	*/
+/*	$NetBSD: ultra14f.c,v 1.53 1995/08/12 23:00:51 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -786,9 +786,9 @@ uha_free_mscp(uha, mscp, flags)
 	struct uha_mscp *mscp;
 	int flags;
 {
-	int opri;
+	int s;
 
-	opri = splbio();
+	s = splbio();
 
 	mscp->flags = MSCP_FREE;
 	TAILQ_INSERT_HEAD(&uha->free_mscp, mscp, chain);
@@ -800,7 +800,7 @@ uha_free_mscp(uha, mscp, flags)
 	if (!mscp->chain.tqe_next)
 		wakeup(&uha->free_mscp);
 
-	splx(opri);
+	splx(s);
 }
 
 /*
@@ -814,11 +814,11 @@ uha_get_mscp(uha, flags)
 	struct uha_softc *uha;
 	int flags;
 {
-	int opri;
+	int s;
 	struct uha_mscp *mscp;
 	int hashnum;
 
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * If we can and have to, sleep waiting for one to come free
@@ -854,7 +854,7 @@ uha_get_mscp(uha, flags)
 		tsleep(&uha->free_mscp, PRIBIO, "uhamsc", 0);
 	}
 
-	splx(opri);
+	splx(s);
 	return mscp;
 }
 
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index ff3119887936..77c3e1f29606 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.76 1995/08/12 21:36:49 mycroft Exp $	*/
+/*	$NetBSD: sd.c,v 1.77 1995/08/12 22:58:01 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -389,7 +389,7 @@ sdstrategy(bp)
 	struct buf *bp;
 {
 	struct sd_softc *sd = sdcd.cd_devs[SDUNIT(bp->b_dev)];
-	int opri;
+	int s;
 
 	SC_DEBUG(sd->sc_link, SDEV_DB2, ("sdstrategy "));
 	SC_DEBUG(sd->sc_link, SDEV_DB1,
@@ -416,7 +416,7 @@ sdstrategy(bp)
 	    (sd->flags & (SDF_WLABEL|SDF_LABELLING)) != 0) <= 0)
 		goto done;
 
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * Place it in the queue of disk activities for this disk
@@ -429,7 +429,7 @@ sdstrategy(bp)
 	 */
 	sdstart(sd);
 
-	splx(opri);
+	splx(s);
 	return;
 
 bad:
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index 67dde81ed0d1..81557cd8d385 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: st.c,v 1.52 1995/08/12 21:36:52 mycroft Exp $	*/
+/*	$NetBSD: st.c,v 1.53 1995/08/12 22:58:04 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -775,7 +775,7 @@ ststrategy(bp)
 {
 	struct st_softc *st = stcd.cd_devs[STUNIT(bp->b_dev)];
 	struct buf *dp;
-	int opri;
+	int s;
 
 	SC_DEBUG(st->sc_link, SDEV_DB1,
 	    ("ststrategy %d bytes @ blk %d\n", bp->b_bcount, bp->b_blkno));
@@ -805,7 +805,7 @@ ststrategy(bp)
 		bp->b_error = EIO;
 		goto bad;
 	}
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * Place it in the queue of activities for this tape
@@ -825,7 +825,7 @@ ststrategy(bp)
 	 */
 	ststart(st);
 
-	splx(opri);
+	splx(s);
 	return;
 bad:
 	bp->b_flags |= B_ERROR;
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index ff3119887936..77c3e1f29606 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.76 1995/08/12 21:36:49 mycroft Exp $	*/
+/*	$NetBSD: sd.c,v 1.77 1995/08/12 22:58:01 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -389,7 +389,7 @@ sdstrategy(bp)
 	struct buf *bp;
 {
 	struct sd_softc *sd = sdcd.cd_devs[SDUNIT(bp->b_dev)];
-	int opri;
+	int s;
 
 	SC_DEBUG(sd->sc_link, SDEV_DB2, ("sdstrategy "));
 	SC_DEBUG(sd->sc_link, SDEV_DB1,
@@ -416,7 +416,7 @@ sdstrategy(bp)
 	    (sd->flags & (SDF_WLABEL|SDF_LABELLING)) != 0) <= 0)
 		goto done;
 
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * Place it in the queue of disk activities for this disk
@@ -429,7 +429,7 @@ sdstrategy(bp)
 	 */
 	sdstart(sd);
 
-	splx(opri);
+	splx(s);
 	return;
 
 bad:
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 67dde81ed0d1..81557cd8d385 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: st.c,v 1.52 1995/08/12 21:36:52 mycroft Exp $	*/
+/*	$NetBSD: st.c,v 1.53 1995/08/12 22:58:04 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -775,7 +775,7 @@ ststrategy(bp)
 {
 	struct st_softc *st = stcd.cd_devs[STUNIT(bp->b_dev)];
 	struct buf *dp;
-	int opri;
+	int s;
 
 	SC_DEBUG(st->sc_link, SDEV_DB1,
 	    ("ststrategy %d bytes @ blk %d\n", bp->b_bcount, bp->b_blkno));
@@ -805,7 +805,7 @@ ststrategy(bp)
 		bp->b_error = EIO;
 		goto bad;
 	}
-	opri = splbio();
+	s = splbio();
 
 	/*
 	 * Place it in the queue of activities for this tape
@@ -825,7 +825,7 @@ ststrategy(bp)
 	 */
 	ststart(st);
 
-	splx(opri);
+	splx(s);
 	return;
 bad:
 	bp->b_flags |= B_ERROR;