Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus

1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 199fcf79a051..f8724f2e0158 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -162,8 +162,6 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd);
 static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd);
 static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd);
 static int qla4xxx_slave_alloc(struct scsi_device *device);
-static int qla4xxx_slave_configure(struct scsi_device *device);
-static void qla4xxx_slave_destroy(struct scsi_device *sdev);
 static umode_t qla4_attr_is_visible(int param_type, int param);
 static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type);
 static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth,
@@ -204,9 +202,7 @@ static struct scsi_host_template qla4xxx_driver_template = {
         .eh_host_reset_handler  = qla4xxx_eh_host_reset,
         .eh_timed_out           = qla4xxx_eh_cmd_timed_out,
 
-        .slave_configure        = qla4xxx_slave_configure,
         .slave_alloc            = qla4xxx_slave_alloc,
-        .slave_destroy          = qla4xxx_slave_destroy,
         .change_queue_depth     = qla4xxx_change_queue_depth,
 
         .this_id                = -1,
@@ -218,6 +214,7 @@ static struct scsi_host_template qla4xxx_driver_template = {
         .shost_attrs            = qla4xxx_host_attrs,
         .host_reset             = qla4xxx_host_reset,
         .vendor_id              = SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_QLOGIC,
+        .use_blk_tags           = 1,
 };
 
 static struct iscsi_transport qla4xxx_iscsi_transport = {
@@ -9060,26 +9057,14 @@ static int qla4xxx_slave_alloc(struct scsi_device *sdev)
         ddb = sess->dd_data;
 
         sdev->hostdata = ddb;
-        sdev->tagged_supported = 1;
 
         if (ql4xmaxqdepth != 0 && ql4xmaxqdepth <= 0xffffU)
                 queue_depth = ql4xmaxqdepth;
 
-        scsi_activate_tcq(sdev, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
         return 0;
 }
 
-static int qla4xxx_slave_configure(struct scsi_device *sdev)
-{
-        sdev->tagged_supported = 1;
-        return 0;
-}
-
-static void qla4xxx_slave_destroy(struct scsi_device *sdev)
-{
-        scsi_deactivate_tcq(sdev, 1);
-}
-
 static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth,
                                       int reason)
 {