scsi: drop reason argument from ->change_queue_depth

Drop the now unused reason argument from the ->change_queue_depth method.
Also add a return value to scsi_adjust_queue_depth, and rename it to
scsi_change_queue_depth now that it can be used as the default
->change_queue_depth implementation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>

2 files changed, 6 insertions, 13 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index c8bb6abbf12c..de46385dbe71 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1164,7 +1164,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
 
                 depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id));
                 depth = min(ATA_MAX_QUEUE - 1, depth);
-                scsi_adjust_queue_depth(sdev, depth);
+                scsi_change_queue_depth(sdev, depth);
         }
 
         blk_queue_flush_queueable(q, false);
@@ -1243,21 +1243,17 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev)
  *      @ap: ATA port to which the device change the queue depth
  *      @sdev: SCSI device to configure queue depth for
  *      @queue_depth: new queue depth
- *      @reason: calling context
  *
  *      libsas and libata have different approaches for associating a sdev to
  *      its ata_port.
  *
  */
 int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
-                             int queue_depth, int reason)
+                             int queue_depth)
 {
         struct ata_device *dev;
         unsigned long flags;
 
-        if (reason != SCSI_QDEPTH_DEFAULT)
-                return -EOPNOTSUPP;
-
         if (queue_depth < 1 || queue_depth == sdev->queue_depth)
                 return sdev->queue_depth;
 
@@ -1282,15 +1278,13 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
         if (sdev->queue_depth == queue_depth)
                 return -EINVAL;
 
-        scsi_adjust_queue_depth(sdev, queue_depth);
-        return queue_depth;
+        return scsi_change_queue_depth(sdev, queue_depth);
 }
 
 /**
  *      ata_scsi_change_queue_depth - SCSI callback for queue depth config
  *      @sdev: SCSI device to configure queue depth for
  *      @queue_depth: new queue depth
- *      @reason: calling context
  *
  *      This is libata standard hostt->change_queue_depth callback.
  *      SCSI will call into this callback when user tries to set queue
@@ -1302,12 +1296,11 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
  *      RETURNS:
  *      Newly configured queue depth.
  */
-int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth,
-                                int reason)
+int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
 {
         struct ata_port *ap = ata_shost_to_port(sdev->host);
 
-        return __ata_change_queue_depth(ap, sdev, queue_depth, reason);
+        return __ata_change_queue_depth(ap, sdev, queue_depth);
 }
 
 /**
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index cdf99fac139a..1db6f5ce5e89 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1951,7 +1951,7 @@ static int nv_swncq_slave_config(struct scsi_device *sdev)
         ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
         if (strncmp(model_num, "Maxtor", 6) == 0) {
-                ata_scsi_change_queue_depth(sdev, 1, SCSI_QDEPTH_DEFAULT);
+                ata_scsi_change_queue_depth(sdev, 1);
                 ata_dev_notice(dev, "Disabling SWNCQ mode (depth %x)\n",
                                sdev->queue_depth);
         }