* [PATCH] scsi: remove hosts.h
@ 2006-10-04 8:22 Henne
2006-10-10 9:36 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Henne @ 2006-10-04 8:22 UTC (permalink / raw)
To: Andrew Morton; +Cc: James Bottomley, linux-scsi, linux-kernel
Remove the obsolete hosts.h file under drivers/scsi.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
b/drivers/scsi/dpt_i2o.c | 2 +-
b/drivers/scsi/dpti.h | 2 +-
b/drivers/scsi/ips.c | 6 ------
b/drivers/scsi/pcmcia/nsp_cs.c | 1 -
drivers/scsi/hosts.h | 2 --
5 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 7b3bd34..b20b376 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -2212,7 +2212,7 @@ static s32 adpt_scsi_register(adpt_hba*
*/
host->io_port = 0;
host->n_io_port = 0;
- /* see comments in hosts.h */
+ /* see comments in scsi_host.h */
host->max_id = 16;
host->max_lun = 256;
host->max_channel = pHba->top_scsi_channel + 1;
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h
index 2ad2a89..2899832 100644
--- a/drivers/scsi/dpti.h
+++ b/drivers/scsi/dpti.h
@@ -44,7 +44,7 @@ static int adpt_device_reset(struct scsi
/*
- * struct scsi_host_template (see hosts.h)
+ * struct scsi_host_template (see scsi/scsi_host.h)
*/
#define DPT_DRIVER_NAME "Adaptec I2O RAID"
diff --git a/drivers/scsi/hosts.h b/drivers/scsi/hosts.h
deleted file mode 100644
index c27264b..0000000
--- a/drivers/scsi/hosts.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "This file is obsolete, please use <scsi/scsi_host.h> instead"
-#include <scsi/scsi_host.h>
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 3c63928..ea03dd7 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -182,14 +182,8 @@ #include <linux/types.h>
#include <linux/dma-mapping.h>
#include <scsi/sg.h>
-
#include "scsi.h"
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
-#include "hosts.h"
-#else
#include <scsi/scsi_host.h>
-#endif
#include "ips.h"
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 0d4c04e..053303d 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -80,7 +80,6 @@ static int free_ports = 0;
module_param(free_ports, bool, 0);
MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))");
-/* /usr/src/linux/drivers/scsi/hosts.h */
static struct scsi_host_template nsp_driver_template = {
.proc_name = "nsp_cs",
.proc_info = nsp_proc_info,
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] scsi: remove hosts.h
2006-10-04 8:22 [PATCH] scsi: remove hosts.h Henne
@ 2006-10-10 9:36 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2006-10-10 9:36 UTC (permalink / raw)
To: Henne; +Cc: Andrew Morton, James Bottomley, linux-scsi, linux-kernel
On Wed, Oct 04, 2006 at 10:22:09AM +0200, Henne wrote:
> Remove the obsolete hosts.h file under drivers/scsi.
> Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Ok. I thought we had remove this one long time ago.
>
> ---
>
> b/drivers/scsi/dpt_i2o.c | 2 +-
> b/drivers/scsi/dpti.h | 2 +-
> b/drivers/scsi/ips.c | 6 ------
> b/drivers/scsi/pcmcia/nsp_cs.c | 1 -
> drivers/scsi/hosts.h | 2 --
> 5 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
> index 7b3bd34..b20b376 100644
> --- a/drivers/scsi/dpt_i2o.c
> +++ b/drivers/scsi/dpt_i2o.c
> @@ -2212,7 +2212,7 @@ static s32 adpt_scsi_register(adpt_hba*
> */
> host->io_port = 0;
> host->n_io_port = 0;
> - /* see comments in hosts.h */
> + /* see comments in scsi_host.h */
> host->max_id = 16;
> host->max_lun = 256;
> host->max_channel = pHba->top_scsi_channel + 1;
> diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h
> index 2ad2a89..2899832 100644
> --- a/drivers/scsi/dpti.h
> +++ b/drivers/scsi/dpti.h
> @@ -44,7 +44,7 @@ static int adpt_device_reset(struct scsi
>
>
> /*
> - * struct scsi_host_template (see hosts.h)
> + * struct scsi_host_template (see scsi/scsi_host.h)
> */
>
> #define DPT_DRIVER_NAME "Adaptec I2O RAID"
> diff --git a/drivers/scsi/hosts.h b/drivers/scsi/hosts.h
> deleted file mode 100644
> index c27264b..0000000
> --- a/drivers/scsi/hosts.h
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -#warning "This file is obsolete, please use <scsi/scsi_host.h> instead"
> -#include <scsi/scsi_host.h>
> diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
> index 3c63928..ea03dd7 100644
> --- a/drivers/scsi/ips.c
> +++ b/drivers/scsi/ips.c
> @@ -182,14 +182,8 @@ #include <linux/types.h>
> #include <linux/dma-mapping.h>
>
> #include <scsi/sg.h>
> -
> #include "scsi.h"
> -
> -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
> -#include "hosts.h"
> -#else
> #include <scsi/scsi_host.h>
> -#endif
>
> #include "ips.h"
>
> diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
> index 0d4c04e..053303d 100644
> --- a/drivers/scsi/pcmcia/nsp_cs.c
> +++ b/drivers/scsi/pcmcia/nsp_cs.c
> @@ -80,7 +80,6 @@ static int free_ports = 0;
> module_param(free_ports, bool, 0);
> MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))");
>
> -/* /usr/src/linux/drivers/scsi/hosts.h */
> static struct scsi_host_template nsp_driver_template = {
> .proc_name = "nsp_cs",
> .proc_info = nsp_proc_info,
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
---end quoted text---
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-10-10 9:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-04 8:22 [PATCH] scsi: remove hosts.h Henne
2006-10-10 9:36 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox