[SBUS]: Further cleanup of scsi driver header usage.

diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index 5237cad180f079536bb5384b04effd42300a576d..782c31becb3ad151fb4d62d208d3f9f70ff2bd93 100644 (file)
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -25,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 
 #include "esp.h"
 
@@ -36,13 +37,17 @@
 #include <asm/oplib.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-
 #ifndef __sparc_v9__
 #include <asm/machines.h>
 #include <asm/idprom.h>
 #endif
 
-#include <linux/module.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_eh.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
 
 #define DEBUG_ESP
 /* #define DEBUG_ESP_HME */

diff --git a/drivers/scsi/esp.h b/drivers/scsi/esp.h
index 2957394694a6a42a27847a58c90c1f9b73ee64dc..85beb475089cb07c804e763740a055f44ca40fa1 100644 (file)
--- a/drivers/scsi/esp.h
+++ b/drivers/scsi/esp.h
@@ -8,22 +8,9 @@
 #ifndef _SPARC_ESP_H
 #define _SPARC_ESP_H
 
-#include <linux/config.h>
-
-/* #include "scsi.h" */
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_request.h>
-#include <scsi/scsi_tcq.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-
 /* For dvma controller register definitions. */
 #include <asm/dma.h>
 
-#define scsi_to_sbus_dma_dir(scsi_dir) ((int)(scsi_dir))
-
 /* The ESP SCSI controllers have their register sets in three
  * "classes":
  *
@@ -86,6 +73,8 @@ struct esp_device {
   unsigned disconnect:1;
 };
 
+struct scsi_cmnd;
+
 /* We get one of these for each ESP probed. */
 struct esp {
        unsigned long           eregs;          /* ESP controller registers */

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 29522c4f5113431398302108583f74dd474280cc..c49ca7f2fd87df3c77d75e7fc744b42a121afbb2 100644 (file)
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 
 #include <asm/byteorder.h>
 
@@ -37,7 +38,15 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <linux/module.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_eh.h>
+#include <scsi/scsi_request.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/scsi_host.h>
+
+
 
 #define MAX_TARGETS    16
 #define MAX_LUNS       8       /* 32 for 1.31 F/W */

diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h
index 91dead6ad66847e5d332819d6e1c1aad74e11192..a40ff75cabc85fa290a74decf354331c801d01d8 100644 (file)
--- a/drivers/scsi/qlogicpti.h
+++ b/drivers/scsi/qlogicpti.h
@@ -6,19 +6,6 @@
 #ifndef _QLOGICPTI_H
 #define _QLOGICPTI_H
 
-#include <linux/config.h>
-
-/* #include "scsi.h" */
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_request.h>
-#include <scsi/scsi_tcq.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-
-#define scsi_to_sbus_dma_dir(scsi_dir) ((int)(scsi_dir))
-
 /* Qlogic/SBUS controller registers. */
 #define SBUS_CFG1      0x006UL
 #define SBUS_CTRL      0x008UL
@@ -343,6 +330,8 @@ struct pti_queue_entry {
        char __opaque[QUEUE_ENTRY_LEN];
 };
 
+struct scsi_cmnd;
+
 /* Software state for the driver. */
 struct qlogicpti {
        /* These are the hot elements in the cache, so they come first. */