From 6ffb8bf9af1d6800f2c8b2595b03e7696ec1a850 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Tue, 2 Sep 1997 20:06:59 +0000
Subject: Removed unused #includes.

---
 sys/scsi/cd.c          |  7 +------
 sys/scsi/ch.c          |  9 +--------
 sys/scsi/od.c          | 12 +-----------
 sys/scsi/pt.c          |  4 +---
 sys/scsi/scsi_base.c   |  8 +-------
 sys/scsi/scsi_driver.c |  7 +------
 sys/scsi/scsi_ioctl.c  |  6 +-----
 sys/scsi/scsiconf.c    |  8 +-------
 sys/scsi/sctarg.c      |  4 +---
 sys/scsi/sd.c          |  6 +-----
 sys/scsi/st.c          |  7 +------
 sys/scsi/su.c          |  8 +-------
 sys/scsi/worm.c        |  4 +---
 13 files changed, 13 insertions(+), 77 deletions(-)

(limited to 'sys/scsi')

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 00df2f7..448eedf 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.82 1997/04/02 09:05:38 jmg Exp $
+ *      $Id: cd.c,v 1.83 1997/05/04 15:24:22 joerg Exp $
  */
 
 #include "opt_bounce.h"
@@ -22,18 +22,13 @@
 
 #define SPLCD splbio
 #define ESUCCESS 0
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/dkbad.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
-#include <sys/uio.h>
-#include <sys/malloc.h>
 #include <sys/cdio.h>
-#include <sys/errno.h>
 #include <sys/disklabel.h>
 #include <sys/dkstat.h>
 #include <sys/kernel.h>
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index f8c5e57..f68f65a 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -33,16 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ch.c,v 1.39 1997/03/24 04:26:46 bde Exp $
+ *      $Id: ch.c,v 1.40 1997/03/24 11:24:55 bde Exp $
  */
 
-#include "opt_scsi.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/chio.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
@@ -51,12 +46,10 @@
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
-#include <scsi/scsi_all.h>
 #include <scsi/scsi_changer.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_driver.h>
 
-#include "ch.h"
 
 #define CHRETRIES	2
 #define CHUNIT(x)	(minor((x)))
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 5f69a35..7c983eb 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.29 1997/03/23 06:33:45 bde Exp $
+ *	$Id: od.c,v 1.30 1997/03/24 11:25:01 bde Exp $
  */
 
 /*
@@ -60,33 +60,23 @@
 #include "opt_od.h"
 
 #define SPLOD splbio
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/dkbad.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
-#include <sys/uio.h>
-#include <sys/malloc.h>
 #include <sys/cdio.h>
-#include <sys/errno.h>
 #include <sys/dkstat.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#include <scsi/scsi_all.h>
 #include <scsi/scsi_disk.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
-#include <vm/vm.h>
-#include <sys/dkstat.h>
-#include <machine/md_var.h>
 
 static u_int32_t odstrats, odqueues;
 
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 1791aa4..9aa1692 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pt.c,v 1.21 1997/03/23 06:33:45 bde Exp $
+ *      $Id: pt.c,v 1.22 1997/05/21 19:35:10 joerg Exp $
  */
 
 #include "opt_bounce.h"
@@ -46,13 +46,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index d4b4f77..4d18568 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.48 1997/04/04 19:37:20 gibbs Exp $
+ *      $Id: scsi_base.c,v 1.49 1997/07/25 23:25:20 jdp Exp $
  */
 
 #include "opt_bounce.h"
@@ -16,15 +16,10 @@
 
 #define SPLSD splbio
 #define ESUCCESS 0
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/buf.h>
-#include <sys/uio.h>
 #include <sys/malloc.h>
-#include <sys/errno.h>
 
 #include <machine/clock.h>
 
@@ -32,7 +27,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <scsi/scsi_all.h>
 #include <scsi/scsi_disk.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
diff --git a/sys/scsi/scsi_driver.c b/sys/scsi/scsi_driver.c
index 7678421..d71d6b7 100644
--- a/sys/scsi/scsi_driver.c
+++ b/sys/scsi/scsi_driver.c
@@ -35,21 +35,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: scsi_driver.c,v 1.24 1997/06/25 19:07:42 tegge Exp $
+ * $Id: scsi_driver.c,v 1.25 1997/09/02 04:37:57 bde Exp $
  *
  */
 
 #include "opt_scsi.h"
 
-#include <sys/types.h>
-#include <sys/errno.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/malloc.h>
-#include <sys/fcntl.h>
 
-#include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index 86a4f7e..8484a7d 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- * $Id: scsi_ioctl.c,v 1.24 1997/02/22 09:44:33 peter Exp $
+ * $Id: scsi_ioctl.c,v 1.25 1997/03/23 06:33:48 bde Exp $
  *
  *
  */
@@ -46,7 +46,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 
@@ -55,10 +54,7 @@
 
 #include <sys/fcntl.h>
 #include <sys/proc.h>
-#include <vm/vm.h>
 
-#include "scbus.h"
-#include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <sys/scsiio.h>
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 79c9728..c59b344 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -16,15 +16,13 @@
  *
  * New configuration setup: dufault@hda.com
  *
- *      $Id: scsiconf.c,v 1.88 1997/05/25 14:20:28 joerg Exp $
+ *      $Id: scsiconf.c,v 1.89 1997/06/11 22:29:01 se Exp $
  */
 
 #include "opt_scsi.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/stat.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #ifdef PC98
@@ -33,8 +31,6 @@
 
 #include <machine/clock.h>
 
-#include "scbus.h"
-
 #include "sd.h"
 #include "st.h"
 #include "cd.h"
@@ -43,10 +39,8 @@
 #include "pt.h"
 #include "worm.h"
 
-#include "su.h"
 #include "sctarg.h"
 
-#include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 3015e2a..99549be 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sctarg.c,v 1.19 1997/02/22 09:44:36 peter Exp $
+ *      $Id: sctarg.c,v 1.20 1997/03/23 06:33:51 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -46,13 +46,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 4578cc7..fe7ba61 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -15,7 +15,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.106 1997/06/25 19:07:43 tegge Exp $
+ *      $Id: sd.c,v 1.107 1997/08/09 01:44:22 julian Exp $
  */
 
 #include "opt_bounce.h"
@@ -30,21 +30,17 @@
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
 #include <sys/dkstat.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
-#include <scsi/scsi_all.h>
 #include <scsi/scsi_disk.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <machine/md_var.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index c00fe71..9f419e0 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.78 1997/03/24 11:25:03 bde Exp $
+ * $Id: st.c,v 1.79 1997/08/23 21:05:32 steve Exp $
  */
 
 /*
@@ -30,16 +30,12 @@
 #include "opt_bounce.h"
 #include "opt_scsi.h"
 
-#include <sys/types.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <sys/fcntl.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/mtio.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
@@ -47,7 +43,6 @@
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
-#include <scsi/scsi_all.h>
 #include <scsi/scsi_tape.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
diff --git a/sys/scsi/su.c b/sys/scsi/su.c
index cd4492c..434d9fd 100644
--- a/sys/scsi/su.c
+++ b/sys/scsi/su.c
@@ -44,7 +44,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- *      $Id$
+ *      $Id: su.c,v 1.16 1997/02/22 09:44:40 peter Exp $
  *
  * Tabstops 4
  * XXX devfs entries for this device should be handled by generic scsiconfig
@@ -53,15 +53,9 @@
 
 #include <sys/param.h>
 #include <sys/conf.h>
-#include <sys/errno.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/buf.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif /*DEVFS*/
 #include <scsi/scsiconf.h>
 #define CDEV_MAJOR 18
 
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index 785a349..11d22fc 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.43 1997/07/26 15:07:42 jmz Exp $
+ *      $Id: worm.c,v 1.44 1997/08/01 12:48:35 jmz Exp $
  */
 
 #include "opt_bounce.h"
@@ -52,7 +52,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/cdio.h>
 #include <sys/wormio.h>
 #include <sys/fcntl.h>
@@ -61,7 +60,6 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_disk.h>
-- 
cgit v1.1