Skip to contentSkip to conversation

remove final hosts.h usage removal

PATCH Arjan van de Ven 2 participants 3 messages Jun 19, 2004

Subsystems (9)
Network drivers SCSI USB Block layer +5 more subsystems
lore
Share & tools
lore

Arjan van de Ven

author
#0 lore raw

Hi,

the patch eblow finishes off the removal of the obsolete hosts.h usage, and now that the users are gone, it's safe to turn on the warning to prevent accidental future use... Please apply

Greetings,
Arjan van de Ven

drivers/scsi/hosts.h +1 -1
diff -urNp linux-2.6.7/drivers/scsi/hosts.h linux/drivers/scsi/hosts.h
@@ -1,2 +1,2 @@
-// #warning "This file is obsolete, please use <scsi/scsi_host.h> instead"
+#warning "This file is obsolete, please use <scsi/scsi_host.h> instead"
 #include <scsi/scsi_host.h>
drivers/block/cciss_scsi.c +1 -1
diff -purN linux-2.6.7/drivers/block/cciss_scsi.c linux/drivers/block/cciss_scsi.c
@@ -29,7 +29,7 @@
    physical nor logical disks are presented through the scsi layer. */
 
 #include "../scsi/scsi.h" 
-#include "../scsi/hosts.h" 
+#include <scsi/scsi_host.h> 
 #include <asm/atomic.h>
 #include <linux/timer.h>
 #include <linux/completion.h>
drivers/ieee1394/sbp2.c +1 -1
diff -purN linux-2.6.7/drivers/ieee1394/sbp2.c linux/drivers/ieee1394/sbp2.c
@@ -65,7 +65,7 @@
 #include <asm/scatterlist.h>
 
 #include "../scsi/scsi.h"
-#include "../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "csr1212.h"
 #include "ieee1394.h"
drivers/message/fusion/mptctl.c +1 -1
diff -purN linux-2.6.7/drivers/message/fusion/mptctl.c linux/drivers/message/fusion/mptctl.c
@@ -91,7 +91,7 @@
 #include <linux/kdev_t.h>	/* needed for access to Scsi_Host struct */
 #include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #define COPYRIGHT	"Copyright (c) 1999-2004 LSI Logic Corporation"
 #define MODULEAUTHOR	"Steven J. Ralston, Noah Romer, Pamela Delaney"
drivers/scsi/aha152x.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/aha152x.c linux/drivers/scsi/aha152x.c
@@ -257,7 +257,7 @@
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha152x.h"
drivers/scsi/gdth.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/gdth.c linux/drivers/scsi/gdth.c
@@ -410,7 +410,7 @@
 #endif
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "gdth.h"
 
 static void gdth_delay(int milliseconds);
drivers/scsi/pcmcia/nsp_cs.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/pcmcia/nsp_cs.c linux/drivers/scsi/pcmcia/nsp_cs.c
@@ -46,7 +46,7 @@
 #include <asm/irq.h>
 
 #include <../drivers/scsi/scsi.h>
-#include <../drivers/scsi/hosts.h>
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_ioctl.h>
drivers/usb/image/hpusbscsi.c +1 -1
diff -purN linux-2.6.7/drivers/usb/image/hpusbscsi.c linux/drivers/usb/image/hpusbscsi.c
@@ -11,7 +11,7 @@
 #include <asm/atomic.h>
 #include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "hpusbscsi.h"
drivers/usb/image/microtek.c +1 -1
diff -purN linux-2.6.7/drivers/usb/image/microtek.c linux/drivers/usb/image/microtek.c
@@ -136,7 +136,7 @@
 #include <asm/atomic.h>
 #include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "microtek.h"
#1 lore raw
Quoted 3 lines · Arjan van de Ven

the patch eblow finishes off the removal of the obsolete hosts.h usage, and now that the users are gone, it's safe to turn on the warning to prevent accidental future use... Please apply

Er, a quick look in drivers/scsi/arm shows it still to be in use...

jejb@mulgrave> grep hosts\\.h drivers/scsi/arm/*.c drivers/scsi/arm/acornscsi.c:#include "../hosts.h" drivers/scsi/arm/arxescsi.c:#include "../hosts.h" drivers/scsi/arm/cumana_1.c:#include "../hosts.h" drivers/scsi/arm/cumana_2.c:#include "../hosts.h" drivers/scsi/arm/ecoscsi.c:#include "../hosts.h" drivers/scsi/arm/eesox.c:#include "../hosts.h" drivers/scsi/arm/fas216.c:#include "../hosts.h" drivers/scsi/arm/oak.c:#include "../hosts.h" drivers/scsi/arm/powertec.c:#include "../hosts.h"

James

author
#2 lore raw
Quoted 7 lines · James Bottomley
Quoted 3 lines · Arjan van de Ven

the patch eblow finishes off the removal of the obsolete hosts.h usage, and now that the users are gone, it's safe to turn on the warning to prevent accidental future use... Please apply

Er, a quick look in drivers/scsi/arm shows it still to be in use...

Quoted 10 lines

jejb@mulgrave> grep hosts\\.h drivers/scsi/arm/*.c drivers/scsi/arm/acornscsi.c:#include "../hosts.h" drivers/scsi/arm/arxescsi.c:#include "../hosts.h" drivers/scsi/arm/cumana_1.c:#include "../hosts.h" drivers/scsi/arm/cumana_2.c:#include "../hosts.h" drivers/scsi/arm/ecoscsi.c:#include "../hosts.h" drivers/scsi/arm/eesox.c:#include "../hosts.h" drivers/scsi/arm/fas216.c:#include "../hosts.h" drivers/scsi/arm/oak.c:#include "../hosts.h" drivers/scsi/arm/powertec.c:#include "../hosts.h"

ok whacked those too; updated patch below

drivers/scsi/hosts.h +1 -1
diff -urNp linux-2.6.7/drivers/scsi/hosts.h linux/drivers/scsi/hosts.h
@@ -1,2 +1,2 @@
-// #warning "This file is obsolete, please use <scsi/scsi_host.h> instead"
+#warning "This file is obsolete, please use <scsi/scsi_host.h> instead"
 #include <scsi/scsi_host.h>
drivers/block/cciss_scsi.c +1 -1
diff -purN linux-2.6.7/drivers/block/cciss_scsi.c linux/drivers/block/cciss_scsi.c
@@ -29,7 +29,7 @@
    physical nor logical disks are presented through the scsi layer. */
 
 #include "../scsi/scsi.h" 
-#include "../scsi/hosts.h" 
+#include <scsi/scsi_host.h> 
 #include <asm/atomic.h>
 #include <linux/timer.h>
 #include <linux/completion.h>
drivers/fc4/fc.c +1 -1
diff -purN linux-2.6.7/drivers/fc4/fc.c linux/drivers/fc4/fc.c
@@ -38,7 +38,7 @@
 #include <asm/irq.h>
 #include <asm/semaphore.h>
 #include "fcp_impl.h"
-#include "../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 /* #define FCDEBUG */
drivers/ieee1394/sbp2.c +1 -1
diff -purN linux-2.6.7/drivers/ieee1394/sbp2.c linux/drivers/ieee1394/sbp2.c
@@ -65,7 +65,7 @@
 #include <asm/scatterlist.h>
 
 #include "../scsi/scsi.h"
-#include "../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "csr1212.h"
 #include "ieee1394.h"
drivers/message/fusion/mptctl.c +1 -1
diff -purN linux-2.6.7/drivers/message/fusion/mptctl.c linux/drivers/message/fusion/mptctl.c
@@ -91,7 +91,7 @@
 #include <linux/kdev_t.h>	/* needed for access to Scsi_Host struct */
 #include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #define COPYRIGHT	"Copyright (c) 1999-2004 LSI Logic Corporation"
 #define MODULEAUTHOR	"Steven J. Ralston, Noah Romer, Pamela Delaney"
drivers/net/fc/iph5526.c +1 -1
diff -purN linux-2.6.7/drivers/net/fc/iph5526.c linux/drivers/net/fc/iph5526.c
@@ -52,7 +52,7 @@ static const char *version =
 			       others + includes if_fcdevice.h */
 
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 #include "../../fc4/fcp.h"
 
 #include <asm/system.h>
drivers/scsi/aha152x.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/aha152x.c linux/drivers/scsi/aha152x.c
@@ -257,7 +257,7 @@
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha152x.h"
drivers/scsi/arm/acornscsi.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/acornscsi.c linux/drivers/scsi/arm/acornscsi.c
@@ -150,7 +150,7 @@
 #include <asm/ecard.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 #include "acornscsi.h"
 #include "msgqueue.h"
 #include "scsi.h"
drivers/scsi/arm/arxescsi.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/arxescsi.c linux/drivers/scsi/arm/arxescsi.c
@@ -37,7 +37,7 @@
 #include <asm/ecard.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 #include "fas216.h"
 
 struct arxescsi_info {
drivers/scsi/arm/cumana_1.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/cumana_1.c linux/drivers/scsi/arm/cumana_1.c
@@ -17,7 +17,7 @@
 #include <asm/system.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsicam.h>
drivers/scsi/arm/cumana_2.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/cumana_2.c linux/drivers/scsi/arm/cumana_2.c
@@ -35,7 +35,7 @@
 #include <asm/pgtable.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 #include "fas216.h"
 #include "scsi.h"
drivers/scsi/arm/ecoscsi.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/ecoscsi.c linux/drivers/scsi/arm/ecoscsi.c
@@ -33,7 +33,7 @@
 #include <asm/system.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 
 #define NCR5380_implementation_fields	int port, ctrl
 #define NCR5380_local_declare()		struct Scsi_Host *_instance
drivers/scsi/arm/eesox.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/eesox.c linux/drivers/scsi/arm/eesox.c
@@ -41,7 +41,7 @@
 #include <asm/pgtable.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 #include "fas216.h"
 #include "scsi.h"
drivers/scsi/arm/fas216.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/fas216.c linux/drivers/scsi/arm/fas216.c
@@ -52,7 +52,7 @@
 #include <asm/ecard.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 #include "fas216.h"
 #include "scsi.h"
drivers/scsi/arm/oak.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/oak.c linux/drivers/scsi/arm/oak.c
@@ -17,7 +17,7 @@
 #include <asm/system.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 
 #define AUTOSENSE
 /*#define PSEUDO_DMA*/
drivers/scsi/arm/powertec.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/arm/powertec.c linux/drivers/scsi/arm/powertec.c
@@ -26,7 +26,7 @@
 #include <asm/pgtable.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 #include "fas216.h"
 #include "scsi.h"
drivers/scsi/gdth.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/gdth.c linux/drivers/scsi/gdth.c
@@ -410,7 +410,7 @@
 #endif
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "gdth.h"
 
 static void gdth_delay(int milliseconds);
drivers/scsi/pcmcia/nsp_cs.c +1 -1
diff -purN linux-2.6.7/drivers/scsi/pcmcia/nsp_cs.c linux/drivers/scsi/pcmcia/nsp_cs.c
@@ -46,7 +46,7 @@
 #include <asm/irq.h>
 
 #include <../drivers/scsi/scsi.h>
-#include <../drivers/scsi/hosts.h>
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_ioctl.h>
drivers/usb/image/hpusbscsi.c +1 -1
diff -purN linux-2.6.7/drivers/usb/image/hpusbscsi.c linux/drivers/usb/image/hpusbscsi.c
@@ -11,7 +11,7 @@
 #include <asm/atomic.h>
 #include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "hpusbscsi.h"
drivers/usb/image/microtek.c +1 -1
diff -purN linux-2.6.7/drivers/usb/image/microtek.c linux/drivers/usb/image/microtek.c
@@ -136,7 +136,7 @@
 #include <asm/atomic.h>
 #include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "microtek.h"