2 files changed, 2 insertions, 9 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 4723d89df5ac..147b80e07b00 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2887,12 +2887,6 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev)
         spin_lock_irqsave(shost->host_lock, flags);
         if (sdev->type == TYPE_DISK)
                 sdev->allow_restart = 1;
-
-        if (sdev->tagged_supported)
-                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG,
-                                sdev->queue_depth);
-        else
-                scsi_adjust_queue_depth(sdev, 0, sdev->queue_depth);
         spin_unlock_irqrestore(shost->host_lock, flags);
         return 0;
 }
@@ -2915,7 +2909,7 @@ static int ibmvfc_change_queue_depth(struct scsi_device *sdev, int qdepth,
         if (qdepth > IBMVFC_MAX_CMDS_PER_LUN)
                 qdepth = IBMVFC_MAX_CMDS_PER_LUN;
 
-        scsi_adjust_queue_depth(sdev, 0, qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
         return sdev->queue_depth;
 }
 
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 7b23f21f22f1..e8c3cdf0d03b 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1929,7 +1929,6 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev)
                 blk_queue_rq_timeout(sdev->request_queue, 120 * HZ);
         }
         spin_unlock_irqrestore(shost->host_lock, lock_flags);
-        scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);
         return 0;
 }
 
@@ -1951,7 +1950,7 @@ static int ibmvscsi_change_queue_depth(struct scsi_device *sdev, int qdepth,
         if (qdepth > IBMVSCSI_MAX_CMDS_PER_LUN)
                 qdepth = IBMVSCSI_MAX_CMDS_PER_LUN;
 
-        scsi_adjust_queue_depth(sdev, 0, qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
         return sdev->queue_depth;
 }