Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

1 files changed, 21 insertions, 26 deletions

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 4f973a49be4c..b9d4f78725b4 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2234,13 +2234,27 @@ mptscsih_slave_destroy(struct scsi_device *device)
         }
 }
 
-static void
-mptscsih_set_queue_depth(struct scsi_device *device, MPT_SCSI_HOST *hd,
-        VirtDevice *pTarget, int qdepth)
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*
+ *      mptscsih_change_queue_depth - This function will set a devices queue depth
+ *      @sdev: per scsi_device pointer
+ *      @qdepth: requested queue depth
+ *
+ *      Adding support for new 'change_queue_depth' api.
+*/
+int
+mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth)
 {
+        MPT_SCSI_HOST   *hd = (MPT_SCSI_HOST *)sdev->host->hostdata;
+        VirtDevice *pTarget;
         int     max_depth;
         int     tagged;
 
+        if (hd == NULL)
+                return 0;
+        if (!(pTarget = hd->Targets[sdev->id]))
+                return 0;
+
         if (hd->ioc->bus_type == SCSI) {
                 if (pTarget->tflags & MPT_TARGET_FLAGS_VALID_INQUIRY) {
                         if (!(pTarget->tflags & MPT_TARGET_FLAGS_Q_YES))
@@ -2264,10 +2278,10 @@ mptscsih_set_queue_depth(struct scsi_device *device, MPT_SCSI_HOST *hd,
         else
                 tagged = MSG_SIMPLE_TAG;
 
-        scsi_adjust_queue_depth(device, tagged, qdepth);
+        scsi_adjust_queue_depth(sdev, tagged, qdepth);
+        return sdev->queue_depth;
 }
 
-
 /*
  *      OS entry point to adjust the queue_depths on a per-device basis.
  *      Called once per device the bus scan. Use it to force the queue_depth
@@ -2317,7 +2331,7 @@ mptscsih_slave_configure(struct scsi_device *device)
 
         mptscsih_initTarget(hd, device->channel, device->id, device->lun,
                 device->inquiry, device->inquiry_len );
-        mptscsih_set_queue_depth(device, hd, pTarget, MPT_SCSI_CMD_PER_DEV_HIGH);
+        mptscsih_change_queue_depth(device, MPT_SCSI_CMD_PER_DEV_HIGH);
 
         dsprintk((MYIOC_s_INFO_FMT
                 "Queue depth=%d, tflags=%x\n",
@@ -2337,25 +2351,6 @@ slave_configure_exit:
         return 0;
 }
 
-ssize_t
-mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
-{
-        int                      depth;
-        struct scsi_device      *sdev = to_scsi_device(dev);
-        MPT_SCSI_HOST           *hd = (MPT_SCSI_HOST *) sdev->host->hostdata;
-        VirtDevice              *pTarget;
-
-        depth = simple_strtoul(buf, NULL, 0);
-        if (depth == 0)
-                return -EINVAL;
-        pTarget = hd->Targets[sdev->id];
-        if (pTarget == NULL)
-                return -EINVAL;
-        mptscsih_set_queue_depth(sdev, (MPT_SCSI_HOST *) sdev->host->hostdata,
-                pTarget, depth);
-        return count;
-}
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *  Private routines...
@@ -5586,7 +5581,7 @@ EXPORT_SYMBOL(mptscsih_taskmgmt_complete);
 EXPORT_SYMBOL(mptscsih_scandv_complete);
 EXPORT_SYMBOL(mptscsih_event_process);
 EXPORT_SYMBOL(mptscsih_ioc_reset);
-EXPORT_SYMBOL(mptscsih_store_queue_depth);
+EXPORT_SYMBOL(mptscsih_change_queue_depth);
 EXPORT_SYMBOL(mptscsih_timer_expired);
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/