scsi: drop reason argument from ->change_queue_depth

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

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 41b9c68bca671675fc1f21e0bd721c08c7d253d8..d11c23aad04613f68eaca6e26be4dd0598c9d9a6 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -462,9 +462,9 @@ static int aac_slave_configure(struct scsi_device *sdev)
                        depth = 256;
                else if (depth < 2)
                        depth = 2;
-               scsi_adjust_queue_depth(sdev, depth);
+               scsi_change_queue_depth(sdev, depth);
        } else
-               scsi_adjust_queue_depth(sdev, 1);
+               scsi_change_queue_depth(sdev, 1);
 
        return 0;
 }
@@ -478,12 +478,8 @@ static int aac_slave_configure(struct scsi_device *sdev)
  *     total capacity and the queue depth supported by the target device.
  */
 
-static int aac_change_queue_depth(struct scsi_device *sdev, int depth,
-                                 int reason)
+static int aac_change_queue_depth(struct scsi_device *sdev, int depth)
 {
-       if (reason != SCSI_QDEPTH_DEFAULT)
-               return -EOPNOTSUPP;
-
        if (sdev->tagged_supported && (sdev->type == TYPE_DISK) &&
            (sdev_channel(sdev) == CONTAINER_CHANNEL)) {
                struct scsi_device * dev;
@@ -504,10 +500,10 @@ static int aac_change_queue_depth(struct scsi_device *sdev, int depth,
                        depth = 256;
                else if (depth < 2)
                        depth = 2;
-               scsi_adjust_queue_depth(sdev, depth);
-       } else
-               scsi_adjust_queue_depth(sdev, 1);
-       return sdev->queue_depth;
+               return scsi_change_queue_depth(sdev, depth);
+       }
+
+       return scsi_change_queue_depth(sdev, 1);
 }
 
 static ssize_t aac_show_raid_level(struct device *dev, struct device_attribute *attr, char *buf)