1 files changed, 2 insertions, 46 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 33166ebec7d8..20049b176b64 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -270,6 +270,7 @@ struct scsi_host_template qla2xxx_driver_template = {
 
         .supported_mode         = MODE_INITIATOR,
         .use_blk_tags           = 1,
+        .track_queue_depth      = 1,
 };
 
 static struct scsi_transport_template *qla2xxx_transport_template = NULL;
@@ -1415,55 +1416,10 @@ qla2xxx_slave_destroy(struct scsi_device *sdev)
         sdev->hostdata = NULL;
 }
 
-static void qla2x00_handle_queue_full(struct scsi_device *sdev, int qdepth)
-{
-        fc_port_t *fcport = (struct fc_port *) sdev->hostdata;
-
-        if (!scsi_track_queue_full(sdev, qdepth))
-                return;
-
-        ql_dbg(ql_dbg_io, fcport->vha, 0x3029,
-            "Queue depth adjusted-down to %d for nexus=%ld:%d:%llu.\n",
-            sdev->queue_depth, fcport->vha->host_no, sdev->id, sdev->lun);
-}
-
-static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth)
-{
-        fc_port_t *fcport = sdev->hostdata;
-        struct scsi_qla_host *vha = fcport->vha;
-        struct req_que *req = NULL;
-
-        req = vha->req;
-        if (!req)
-                return;
-
-        if (req->max_q_depth <= sdev->queue_depth || req->max_q_depth < qdepth)
-                return;
-
-        scsi_adjust_queue_depth(sdev, qdepth);
-
-        ql_dbg(ql_dbg_io, vha, 0x302a,
-            "Queue depth adjusted-up to %d for nexus=%ld:%d:%llu.\n",
-            sdev->queue_depth, fcport->vha->host_no, sdev->id, sdev->lun);
-}
-
 static int
 qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
 {
-        switch (reason) {
-        case SCSI_QDEPTH_DEFAULT:
-                scsi_adjust_queue_depth(sdev, qdepth);
-                break;
-        case SCSI_QDEPTH_QFULL:
-                qla2x00_handle_queue_full(sdev, qdepth);
-                break;
-        case SCSI_QDEPTH_RAMP_UP:
-                qla2x00_adjust_sdev_qdepth_up(sdev, qdepth);
-                break;
-        default:
-                return -EOPNOTSUPP;
-        }
-
+        scsi_adjust_queue_depth(sdev, qdepth);
         return sdev->queue_depth;
 }