ChangeSet 1.2181.4.27, 2005/03/17 18:14:14-08:00, [EMAIL PROTECTED]
[PATCH] USB Storage: Header reorganization
This patch started life as as471 from Alan Stern, and has been
regenerated
against the current tip.
This patch cleans up the use of header files. Primarily it makes sure
that "usb.h" is included before any of the other local headers. It also
removes some unnecessary declarations of struct us_data and struct
scsi_cmnd, and it moves the inclusion of <scsi/scsi_host> to usb.h where
it will be needed by a later patch.
Signed-off-by: Alan Stern <[EMAIL PROTECTED]>
Signed-off-by: Matthew Dharm <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
datafab.c | 2 +-
debug.h | 2 --
dpcm.c | 2 +-
freecom.c | 2 +-
initializers.c | 2 ++
isd200.c | 2 +-
jumpshot.c | 2 +-
protocol.c | 3 ++-
protocol.h | 3 ---
scsiglue.c | 3 +--
scsiglue.h | 5 -----
sddr09.c | 2 +-
sddr55.c | 2 +-
shuttle_usbat.c | 2 +-
transport.c | 2 +-
transport.h | 3 ---
usb.c | 7 +++----
usb.h | 1 +
18 files changed, 18 insertions(+), 29 deletions(-)
diff -Nru a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
--- a/drivers/usb/storage/datafab.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/datafab.c 2005-03-30 15:09:51 -08:00
@@ -57,9 +57,9 @@
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "datafab.h"
diff -Nru a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
--- a/drivers/usb/storage/debug.h 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/debug.h 2005-03-30 15:09:51 -08:00
@@ -47,8 +47,6 @@
#include <linux/config.h>
#include <linux/kernel.h>
-struct scsi_cmnd;
-
#define USB_STORAGE "usb-storage: "
#ifdef CONFIG_USB_STORAGE_DEBUG
diff -Nru a/drivers/usb/storage/dpcm.c b/drivers/usb/storage/dpcm.c
--- a/drivers/usb/storage/dpcm.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/dpcm.c 2005-03-30 15:09:51 -08:00
@@ -34,9 +34,9 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "dpcm.h"
#include "sddr09.h"
diff -Nru a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
--- a/drivers/usb/storage/freecom.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/freecom.c 2005-03-30 15:09:51 -08:00
@@ -34,9 +34,9 @@
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "freecom.h"
diff -Nru a/drivers/usb/storage/initializers.c
b/drivers/usb/storage/initializers.c
--- a/drivers/usb/storage/initializers.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/initializers.c 2005-03-30 15:09:51 -08:00
@@ -39,6 +39,8 @@
#include <linux/sched.h>
#include <linux/errno.h>
+
+#include "usb.h"
#include "initializers.h"
#include "debug.h"
#include "transport.h"
diff -Nru a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
--- a/drivers/usb/storage/isd200.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/isd200.c 2005-03-30 15:09:51 -08:00
@@ -54,9 +54,9 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "scsiglue.h"
#include "isd200.h"
diff -Nru a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
--- a/drivers/usb/storage/jumpshot.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/jumpshot.c 2005-03-30 15:09:51 -08:00
@@ -54,9 +54,9 @@
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "jumpshot.h"
diff -Nru a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
--- a/drivers/usb/storage/protocol.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/protocol.c 2005-03-30 15:09:51 -08:00
@@ -47,8 +47,9 @@
#include <linux/highmem.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
-#include "protocol.h"
+
#include "usb.h"
+#include "protocol.h"
#include "debug.h"
#include "scsiglue.h"
#include "transport.h"
diff -Nru a/drivers/usb/storage/protocol.h b/drivers/usb/storage/protocol.h
--- a/drivers/usb/storage/protocol.h 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/protocol.h 2005-03-30 15:09:51 -08:00
@@ -41,9 +41,6 @@
#ifndef _PROTOCOL_H_
#define _PROTOCOL_H_
-struct scsi_cmnd;
-struct us_data;
-
/* Sub Classes */
#define US_SC_RBC 0x01 /* Typically, flash devices */
diff -Nru a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
--- a/drivers/usb/storage/scsiglue.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/scsiglue.c 2005-03-30 15:09:51 -08:00
@@ -53,10 +53,9 @@
#include <scsi/scsi_devinfo.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_eh.h>
-#include <scsi/scsi_host.h>
-#include "scsiglue.h"
#include "usb.h"
+#include "scsiglue.h"
#include "debug.h"
#include "transport.h"
#include "protocol.h"
diff -Nru a/drivers/usb/storage/scsiglue.h b/drivers/usb/storage/scsiglue.h
--- a/drivers/usb/storage/scsiglue.h 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/scsiglue.h 2005-03-30 15:09:51 -08:00
@@ -41,11 +41,6 @@
#ifndef _SCSIGLUE_H_
#define _SCSIGLUE_H_
-#include <scsi/scsi_host.h>
-
-struct us_data;
-struct scsi_cmnd;
-
extern void usb_stor_report_device_reset(struct us_data *us);
extern unsigned char usb_stor_sense_invalidCDB[18];
diff -Nru a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
--- a/drivers/usb/storage/sddr09.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/sddr09.c 2005-03-30 15:09:51 -08:00
@@ -48,9 +48,9 @@
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "sddr09.h"
diff -Nru a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
--- a/drivers/usb/storage/sddr55.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/sddr55.c 2005-03-30 15:09:51 -08:00
@@ -31,9 +31,9 @@
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "sddr55.h"
diff -Nru a/drivers/usb/storage/shuttle_usbat.c
b/drivers/usb/storage/shuttle_usbat.c
--- a/drivers/usb/storage/shuttle_usbat.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/shuttle_usbat.c 2005-03-30 15:09:51 -08:00
@@ -51,9 +51,9 @@
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
-#include "usb.h"
#include "debug.h"
#include "shuttle_usbat.h"
diff -Nru a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
--- a/drivers/usb/storage/transport.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/transport.c 2005-03-30 15:09:51 -08:00
@@ -54,10 +54,10 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
+#include "usb.h"
#include "transport.h"
#include "protocol.h"
#include "scsiglue.h"
-#include "usb.h"
#include "debug.h"
diff -Nru a/drivers/usb/storage/transport.h b/drivers/usb/storage/transport.h
--- a/drivers/usb/storage/transport.h 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/transport.h 2005-03-30 15:09:51 -08:00
@@ -43,9 +43,6 @@
#include <linux/config.h>
#include <linux/blkdev.h>
-#include "usb.h"
-
-struct scsi_cmnd;
/* Protocols */
diff -Nru a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
--- a/drivers/usb/storage/usb.c 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/usb.c 2005-03-30 15:09:51 -08:00
@@ -51,6 +51,9 @@
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/suspend.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
@@ -88,10 +91,6 @@
#include "jumpshot.h"
#endif
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
/* Some informational data */
MODULE_AUTHOR("Matthew Dharm <[EMAIL PROTECTED]>");
diff -Nru a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
--- a/drivers/usb/storage/usb.h 2005-03-30 15:09:51 -08:00
+++ b/drivers/usb/storage/usb.h 2005-03-30 15:09:51 -08:00
@@ -48,6 +48,7 @@
#include <linux/blkdev.h>
#include <linux/smp_lock.h>
#include <linux/completion.h>
+#include <scsi/scsi_host.h>
struct us_data;
struct scsi_cmnd;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
