diff options
author | dufault <dufault@FreeBSD.org> | 1995-01-19 12:41:36 +0000 |
---|---|---|
committer | dufault <dufault@FreeBSD.org> | 1995-01-19 12:41:36 +0000 |
commit | 05d6c07611e09c335946faa3a8ea79a1fce4bbf7 (patch) | |
tree | a1dadceebf15ccc52bd828fe34f0541cf7306dd7 /sys/scsi | |
parent | 1918e6dc4ca347d2dcdbff5e3adb384dd8b03d1e (diff) | |
download | FreeBSD-src-05d6c07611e09c335946faa3a8ea79a1fce4bbf7.zip FreeBSD-src-05d6c07611e09c335946faa3a8ea79a1fce4bbf7.tar.gz |
Remove dup biodone and no more SCSIUSER option.
Diffstat (limited to 'sys/scsi')
-rw-r--r-- | sys/scsi/scsi_base.c | 4 | ||||
-rw-r--r-- | sys/scsi/scsi_ioctl.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 4fae13b..ac790cc 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -8,7 +8,7 @@ * file. * * Written by Julian Elischer (julian@dialix.oz.au) - * $Id: scsi_base.c,v 1.15 1994/11/15 14:49:56 bde Exp $ + * $Id: scsi_base.c,v 1.16 1995/01/08 13:38:31 dufault Exp $ */ #define SPLSD splbio @@ -330,8 +330,6 @@ scsi_done(xs) * xs when the user returns. (and restarting the device's queue). */ if (xs->flags & SCSI_USER) { - biodone(xs->bp); - SC_DEBUG(sc_link, SDEV_DB3, ("calling user done()\n")); scsi_user_done(xs); /* to take a copy of the sense etc. */ SC_DEBUG(sc_link, SDEV_DB3, ("returned from user done()\n ")); diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 5e4253b..db26691 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -38,11 +38,9 @@ * SUCH DAMAGE. *End copyright * - * $Id: scsi_ioctl.c,v 1.8 1994/10/08 22:26:37 phk Exp $ + * $Id: scsi_ioctl.c,v 1.9 1995/01/08 13:38:32 dufault Exp $ * * - * Note: The SCSIUSER option is required to support the user defined - * ioctl calls. */ #include <sys/param.h> #include <sys/systm.h> @@ -132,7 +130,7 @@ struct scsi_xfer *xs; screq->retsts = SCCMD_UNKNOWN; break; } - biodone(bp); /* we're waiting on it in scsi_strategy() */ + biodone(bp); /* we're waiting on it in scsistrategy() */ return; /* it'll free the xs and restart any queue */ } @@ -252,7 +250,6 @@ struct scsi_link *sc_link, int cmd, caddr_t addr, int f) SC_DEBUG(sc_link,SDEV_DB2,("scsi_do_ioctl(0x%x)\n",cmd)); switch(cmd) { -#ifdef SCSIUSER case SCIOCCOMMAND: { /* @@ -322,7 +319,6 @@ struct scsi_link *sc_link, int cmd, caddr_t addr, int f) } break; } -#endif /* SCSIUSER */ case SCIOCDEBUG: { int level = *((int *)addr); |