[SCSI] convert the remaining mid-layer pieces to scsi_execute_req

After this, we just have some drivers, all the ULDs and the SPI
transport class using scsi_wait_req().

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 11 insertions, 17 deletions

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 835af8ecbb7c..9181068883ce 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -8,9 +8,17 @@
 
 struct request_queue;
 struct scsi_cmnd;
-struct scsi_mode_data;
 struct scsi_lun;
 
+struct scsi_mode_data {
+        __u32   length;
+        __u16   block_descriptor_length;
+        __u8    medium_type;
+        __u8    device_specific;
+        __u8    header_length;
+        __u8    longlba:1;
+};
+
 /*
  * sdev state: If you alter this, you also need to alter scsi_sysfs.c
  * (for the ascii descriptions) and the state model enforcer:
@@ -228,7 +236,8 @@ extern int scsi_set_medium_removal(struct scsi_device *, char);
 
 extern int scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
                            unsigned char *buffer, int len, int timeout,
-                           int retries, struct scsi_mode_data *data);
+                           int retries, struct scsi_mode_data *data,
+                           char *sense);
 extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout,
                                 int retries);
 extern int scsi_device_set_state(struct scsi_device *sdev,
diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index d64903a617c3..f5dfdfec9fea 100644
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -58,19 +58,4 @@ extern int scsi_execute_req(struct scsi_device *sdev, unsigned char *cmd,
                             int data_direction, void *buffer, unsigned bufflen,
                             unsigned char *sense, int timeout, int retries);
 
-struct scsi_mode_data {
-        __u32   length;
-        __u16   block_descriptor_length;
-        __u8    medium_type;
-        __u8    device_specific;
-        __u8    header_length;
-        __u8    longlba:1;
-};
-
-extern int __scsi_mode_sense(struct scsi_request *SRpnt, int dbd,
-                             int modepage, unsigned char *buffer, int len,
-                             int timeout, int retries,
-                             struct scsi_mode_data *data);
-
-
 #endif /* _SCSI_SCSI_REQUEST_H */