Move SCSI command size information into <scsi/scsi.h>, where

the commands themselves already are.

diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h
index f75fe6f1273713232f89a8e39c20d35cb4fff494..6502d635e5e5048da6dfb01447840ceda2d7aa4d 100644 (file)
--- a/drivers/scsi/scsi.h
+++ b/drivers/scsi/scsi.h
@@ -164,8 +164,6 @@ extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
 #define SCSI_OWNER_BH_HANDLER     0x104
 #define SCSI_OWNER_NOBODY         0x105
 
-#define COMMAND_SIZE(opcode) scsi_command_size[((opcode) >> 5) & 7]
-
 #define IDENTIFY_BASE       0x80
 #define IDENTIFY(can_disconnect, lun)   (IDENTIFY_BASE |\
                     ((can_disconnect) ?  0x40 : 0) |\
@@ -415,7 +413,6 @@ extern unsigned int scsi_dma_free_sectors;  /* How much room do we have left */
 extern unsigned int scsi_need_isa_buffer;      /* True if some devices need indirection
                                                   * buffers */
 extern volatile int in_scan_scsis;
-extern const unsigned char scsi_command_size[8];
 
 extern struct bus_type scsi_driverfs_bus_type;
 

diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 9a9709b4af8e4cccbe7b09c527849b67c6862860..c7562734f0ac4547a425a84975bab36c0be1e87c 100644 (file)
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -14,6 +14,13 @@
 
 */
 
+/*
+ * SCSI command lengths
+ */
+
+extern const unsigned char scsi_command_size[8];
+#define COMMAND_SIZE(opcode) scsi_command_size[((opcode) >> 5) & 7]
+
 /*
  *      SCSI opcodes
  */