[PATCH] add scsi_driver.h

[PATCH] add scsi_driver.h

[Christoph Hellwig]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 3909 bytes --]

include/scsi/scsi_driver.h contains æverything related to upper
level drivers.  Unlike the other header moves there's no compatiblity
this time as it's easy to fix up the few users.


diff -Nru a/drivers/scsi/hosts.h b/drivers/scsi/hosts.h
--- a/drivers/scsi/hosts.h	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/hosts.h	Mon Jun 23 11:00:34 2003
@@ -26,28 +26,8 @@
 
 #include <linux/config.h>
 #include <linux/proc_fs.h>
-#include <linux/types.h>
 
 #include <scsi/scsi_host.h>
-
-struct scsi_driver {
-	struct module		*owner;
-	struct device_driver	gendrv;
-
-	int (*init_command)(struct scsi_cmnd *);
-	void (*rescan)(struct device *);
-};
-#define to_scsi_driver(drv) \
-	container_of((drv), struct scsi_driver, gendrv)
-
-extern int scsi_register_driver(struct device_driver *);
-#define scsi_unregister_driver(drv) \
-	driver_unregister(drv);
-
-extern int scsi_register_interface(struct class_interface *);
-#define scsi_unregister_interface(intf) \
-	class_interface_unregister(intf)
-
 
 /**
  * scsi_find_device - find a device given the host
diff -Nru a/drivers/scsi/osst.c b/drivers/scsi/osst.c
--- a/drivers/scsi/osst.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/osst.c	Mon Jun 23 11:00:34 2003
@@ -63,6 +63,7 @@
 
 #include "scsi.h"
 #include "hosts.h"
+#include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 
 #define ST_KILOBYTE 1024
diff -Nru a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_lib.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/scsi_lib.c	Mon Jun 23 11:00:34 2003
@@ -18,6 +18,7 @@
 
 #include "scsi.h"
 #include "hosts.h"
+#include <scsi/scsi_driver.h>
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
diff -Nru a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
--- a/drivers/scsi/scsi_scan.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/scsi_scan.c	Mon Jun 23 11:00:34 2003
@@ -33,6 +33,7 @@
 
 #include "scsi.h"
 #include "hosts.h"
+#include <scsi/scsi_driver.h>
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
diff -Nru a/drivers/scsi/scsi_syms.c b/drivers/scsi/scsi_syms.c
--- a/drivers/scsi/scsi_syms.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/scsi_syms.c	Mon Jun 23 11:00:34 2003
@@ -19,6 +19,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
+#include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 #include "hosts.h"
 #include "scsi_logging.h"
diff -Nru a/drivers/scsi/sd.c b/drivers/scsi/sd.c
--- a/drivers/scsi/sd.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/sd.c	Mon Jun 23 11:00:34 2003
@@ -49,6 +49,8 @@
 
 #include "scsi.h"
 #include "hosts.h"
+
+#include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsicam.h>
 
diff -Nru a/drivers/scsi/sg.c b/drivers/scsi/sg.c
--- a/drivers/scsi/sg.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/sg.c	Mon Jun 23 11:00:34 2003
@@ -64,6 +64,7 @@
 #include <linux/blk.h>
 #include "scsi.h"
 #include "hosts.h"
+#include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/sg.h>
 
diff -Nru a/drivers/scsi/sr.c b/drivers/scsi/sr.c
--- a/drivers/scsi/sr.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/sr.c	Mon Jun 23 11:00:34 2003
@@ -48,6 +48,8 @@
 
 #include "scsi.h"
 #include "hosts.h"
+
+#include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>	/* For the door lock/unlock commands */
 
 #include "scsi_logging.h"
diff -Nru a/drivers/scsi/st.c b/drivers/scsi/st.c
--- a/drivers/scsi/st.c	Mon Jun 23 11:00:34 2003
+++ b/drivers/scsi/st.c	Mon Jun 23 11:00:34 2003
@@ -59,6 +59,8 @@
 
 #include "scsi.h"
 #include "hosts.h"
+
+#include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 
 #define ST_KILOBYTE 1024
-
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

Re: [PATCH] add scsi_driver.h

[James Bottomley]

On Tue, 2003-06-24 at 01:49, Christoph Hellwig wrote:
> include/scsi/scsi_driver.h contains æverything related to upper
> level drivers.  Unlike the other header moves there's no compatiblity
> this time as it's easy to fix up the few users.

This patch actually doesn't seem to contain scsi/scsi_driver.h

James


-
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

Re: [PATCH] add scsi_driver.h

[Christoph Hellwig]

On Wed, Jun 25, 2003 at 11:18:16PM -0500, James Bottomley wrote:
> On Tue, 2003-06-24 at 01:49, Christoph Hellwig wrote:
> > include/scsi/scsi_driver.h contains ?verything related to upper
> > level drivers.  Unlike the other header moves there's no compatiblity
> > this time as it's easy to fix up the few users.
> 
> This patch actually doesn't seem to contain scsi/scsi_driver.h

Looks like I forgot to check it in.  Here it is:


#ifndef _SCSI_SCSI_DRIVER_H
#define _SCSI_SCSI_DRIVER_H

#include <linux/device.h>

struct module;


struct scsi_driver {
	struct module		*owner;
	struct device_driver	gendrv;

	int (*init_command)(struct scsi_cmnd *);
	void (*rescan)(struct device *);
};
#define to_scsi_driver(drv) \
	container_of((drv), struct scsi_driver, gendrv)

extern int scsi_register_driver(struct device_driver *);
#define scsi_unregister_driver(drv) \
	driver_unregister(drv);

extern int scsi_register_interface(struct class_interface *);
#define scsi_unregister_interface(intf) \
	class_interface_unregister(intf)

#endif /* _SCSI_SCSI_DRIVER_H */