Skip to contentSkip to conversation

PATCH [14/18] qla2xxx: Use proper include files

PATCH Andrew Vasquez 2 participants 2 messages Jun 22, 2004

Subsystems (2)
SCSI QLogic QLA2XXX FC-SCSI driver
lore
Share & tools
lore

Andrew Vasquez

author
#0 lore raw

ChangeSet
1.1850 04/06/17 13:52:06 [email protected] +2 -0 Use the standard include/scsi/* headers rather than those in drivers/scsi/. Slightly modified variant from initial patch sent by Christoph Hellwig <hch () lst !de>.

Signed-off-by Andrew Vasquez <[email protected]>
 drivers/scsi/qla2xxx/Makefile |    2 +-
 drivers/scsi/qla2xxx/qla_os.h |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/Makefile +1 -1
diff -Nru a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -Idrivers/scsi -DUNIQUE_FW_NAME
+EXTRA_CFLAGS += -DUNIQUE_FW_NAME
 
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_rscn.o
drivers/scsi/qla2xxx/qla_os.h +6 -4
diff -Nru a/drivers/scsi/qla2xxx/qla_os.h b/drivers/scsi/qla2xxx/qla_os.h
@@ -58,11 +58,13 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 
-#include "scsi.h"
-#include "hosts.h"
-
-#include <scsi/scsicam.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_tcq.h>
 #include <scsi/scsi_ioctl.h>
+#include <scsi/scsicam.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
#1 lore raw
Quoted 9 lines
drivers/scsi/qla2xxx/qla_os.h +0 -3
@@ -58,11 +58,13 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 
-#include "scsi.h"
-#include "hosts.h"
-

drivers/scsi/qla2xxx/qla_os.h line 69

Quoted 10 lines
drivers/scsi/qla2xxx/qla_os.h +6 -1
-#include <scsi/scsicam.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_tcq.h>
 #include <scsi/scsi_ioctl.h>
+#include <scsi/scsicam.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>

Umm, no. I moved them away from qla_os.h precisly because I want to get rid of that file in the next steps.