scsi: avoid ->change_queue_depth indirection for queue full tracking

[karo-tx-linux.git] / drivers / scsi / scsi_error.c

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a6f6b9222b515577ba7619f912043ed09653d63f..2d0f5155ee518238fb5a53c78d61f662dcc202f8 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -610,7 +610,7 @@ static void scsi_handle_queue_ramp_up(struct scsi_device *sdev)
        struct scsi_host_template *sht = sdev->host->hostt;
        struct scsi_device *tmp_sdev;
 
-       if (!sht->change_queue_depth ||
+       if (!sht->track_queue_depth ||
            sdev->queue_depth >= sdev->max_queue_depth)
                return;
 
@@ -631,12 +631,8 @@ static void scsi_handle_queue_ramp_up(struct scsi_device *sdev)
                    tmp_sdev->id != sdev->id ||
                    tmp_sdev->queue_depth == sdev->max_queue_depth)
                        continue;
-               /*
-                * call back into LLD to increase queue_depth by one
-                * with ramp up reason code.
-                */
-               sht->change_queue_depth(tmp_sdev, tmp_sdev->queue_depth + 1,
-                                       SCSI_QDEPTH_RAMP_UP);
+
+               scsi_adjust_queue_depth(tmp_sdev, tmp_sdev->queue_depth + 1);
                sdev->last_queue_ramp_up = jiffies;
        }
 }
@@ -646,7 +642,7 @@ static void scsi_handle_queue_full(struct scsi_device *sdev)
        struct scsi_host_template *sht = sdev->host->hostt;
        struct scsi_device *tmp_sdev;
 
-       if (!sht->change_queue_depth)
+       if (!sht->track_queue_depth)
                return;
 
        shost_for_each_device(tmp_sdev, sdev->host) {
@@ -658,8 +654,7 @@ static void scsi_handle_queue_full(struct scsi_device *sdev)
                 * the device when we got the queue full so we start
                 * from the highest possible value and work our way down.
                 */
-               sht->change_queue_depth(tmp_sdev, tmp_sdev->queue_depth - 1,
-                                       SCSI_QDEPTH_QFULL);
+               scsi_track_queue_full(tmp_sdev, tmp_sdev->queue_depth - 1);
        }
 }