scsi: drop reason argument from ->change_queue_depth

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / ipr.c

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index d8d16625a876261e697173c5cb1877963272e4d3..5402943893559cb47d3f16a33ebf7db294ee2b74 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4328,16 +4328,12 @@ static int ipr_free_dump(struct ipr_ioa_cfg *ioa_cfg) { return 0; };
  * Return value:
  *     actual depth set
  **/
-static int ipr_change_queue_depth(struct scsi_device *sdev, int qdepth,
-                                 int reason)
+static int ipr_change_queue_depth(struct scsi_device *sdev, int qdepth)
 {
        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
        struct ipr_resource_entry *res;
        unsigned long lock_flags = 0;
 
-       if (reason != SCSI_QDEPTH_DEFAULT)
-               return -EOPNOTSUPP;
-
        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
        res = (struct ipr_resource_entry *)sdev->hostdata;
 
@@ -4345,7 +4341,7 @@ static int ipr_change_queue_depth(struct scsi_device *sdev, int qdepth,
                qdepth = IPR_MAX_CMD_PER_ATA_LUN;
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 
-       scsi_adjust_queue_depth(sdev, qdepth);
+       scsi_change_queue_depth(sdev, qdepth);
        return sdev->queue_depth;
 }
 
@@ -4752,7 +4748,7 @@ static int ipr_slave_configure(struct scsi_device *sdev)
                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 
                if (ap) {
-                       scsi_adjust_queue_depth(sdev, IPR_MAX_CMD_PER_ATA_LUN);
+                       scsi_change_queue_depth(sdev, IPR_MAX_CMD_PER_ATA_LUN);
                        ata_sas_slave_configure(sdev, ap);
                }