diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ata/atascsi.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/trm.c | 14 | ||||
| -rw-r--r-- | sys/dev/usb/usscanner.c | 8 |
3 files changed, 5 insertions, 24 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index ea122834b05..a55d7429ead 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.85 2010/05/26 12:17:35 dlg Exp $ */ +/* $OpenBSD: atascsi.c,v 1.86 2010/06/19 21:43:16 krw Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -1129,13 +1129,8 @@ atascsi_atapi_cmd_done(struct ata_xfer *xa) void atascsi_done(struct scsi_xfer *xs, int error) { - int s; - xs->error = error; - - s = splbio(); scsi_done(xs); - splx(s); } void diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c index 29ce4b7a3f0..460a904e314 100644 --- a/sys/dev/ic/trm.c +++ b/sys/dev/ic/trm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trm.c,v 1.19 2010/05/19 15:27:35 oga Exp $ +/* $OpenBSD: trm.c,v 1.20 2010/06/19 21:43:16 krw Exp $ * ------------------------------------------------------------ * O.S : OpenBSD * File Name : trm.c @@ -354,18 +354,14 @@ trm_scsi_cmd(struct scsi_xfer *xs) printf("%s: target=%d >= %d\n", sc->sc_device.dv_xname, target, TRM_MAX_TARGETS); xs->error = XS_DRIVER_STUFFUP; - intflag = splbio(); scsi_done(xs); - splx(intflag); return; } if (lun >= TRM_MAX_LUNS) { printf("%s: lun=%d >= %d\n", sc->sc_device.dv_xname, lun, TRM_MAX_LUNS); xs->error = XS_DRIVER_STUFFUP; - intflag = splbio(); scsi_done(xs); - splx(intflag); return; } @@ -373,9 +369,7 @@ trm_scsi_cmd(struct scsi_xfer *xs) if (pDCB == NULL) { /* Removed as a result of INQUIRY proving no device present */ xs->error = XS_DRIVER_STUFFUP; - intflag = splbio(); scsi_done(xs); - splx(intflag); return; } @@ -386,9 +380,7 @@ trm_scsi_cmd(struct scsi_xfer *xs) #endif trm_reset(sc); xs->error = XS_NOERROR; - intflag = splbio(); scsi_done(xs); - splx(intflag); return; } @@ -401,9 +393,9 @@ trm_scsi_cmd(struct scsi_xfer *xs) pSRB = trm_GetFreeSRB(sc); if (pSRB == NULL) { + splx(intflag); xs->error = XS_NO_CCB; scsi_done(xs); - splx(intflag); return; } @@ -432,8 +424,8 @@ trm_scsi_cmd(struct scsi_xfer *xs) * free SRB */ TAILQ_INSERT_HEAD(&sc->freeSRB, pSRB, link); - scsi_done(xs); splx(intflag); + scsi_done(xs); return; } diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index 5562951320c..351c9a2fbd6 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usscanner.c,v 1.31 2010/03/23 01:57:20 krw Exp $ */ +/* $OpenBSD: usscanner.c,v 1.32 2010/06/19 21:43:16 krw Exp $ */ /* $NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $ */ /* @@ -471,7 +471,6 @@ usscanner_intr_cb(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) { struct usscanner_softc *sc = priv; - int s; DPRINTFN(10, ("usscanner_data_cb status=%d\n", status)); @@ -487,9 +486,7 @@ usscanner_intr_cb(usbd_xfer_handle xfer, usbd_private_handle priv, sc->sc_state = UAS_IDLE; - s = splbio(); scsipi_done(sc->sc_xs); - splx(s); } void @@ -708,7 +705,6 @@ usscanner_scsipi_cmd(struct scsipi_xfer *xs) struct scsipi_link *sc_link = xs->sc_link; struct usscanner_softc *sc = sc_link->adapter_softc; usbd_status err; - int s; #ifdef notyet DPRINTFN(8, ("%s: usscanner_scsi_cmd: %d:%d " @@ -763,7 +759,5 @@ usscanner_scsipi_cmd(struct scsipi_xfer *xs) done: sc->sc_state = UAS_IDLE; - s = splbio(); scsipi_done(xs); - splx(s); } |