Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / esas2r / esas2r_main.c

diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index be09c628d03425c69e87e8d01aa93fefb75ee536..593ff8a63c706a85e8ca61df243160244cccf991 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -254,12 +254,10 @@ static struct scsi_host_template driver_template = {
        .use_clustering                 = ENABLE_CLUSTERING,
        .emulated                       = 0,
        .proc_name                      = ESAS2R_DRVR_NAME,
-       .slave_configure                = esas2r_slave_configure,
-       .slave_alloc                    = esas2r_slave_alloc,
-       .slave_destroy                  = esas2r_slave_destroy,
-       .change_queue_depth             = esas2r_change_queue_depth,
+       .change_queue_depth             = scsi_change_queue_depth,
        .change_queue_type              = scsi_change_queue_type,
        .max_sectors                    = 0xFFFF,
+       .use_blk_tags                   = 1,
 };
 
 int sgl_page_size = 512;
@@ -1259,42 +1257,6 @@ int esas2r_target_reset(struct scsi_cmnd *cmd)
        return esas2r_dev_targ_reset(cmd, true);
 }
 
-int esas2r_change_queue_depth(struct scsi_device *dev, int depth, int reason)
-{
-       esas2r_log(ESAS2R_LOG_INFO, "change_queue_depth %p, %d", dev, depth);
-
-       scsi_adjust_queue_depth(dev, scsi_get_tag_type(dev), depth);
-
-       return dev->queue_depth;
-}
-
-int esas2r_slave_alloc(struct scsi_device *dev)
-{
-       return 0;
-}
-
-int esas2r_slave_configure(struct scsi_device *dev)
-{
-       esas2r_log_dev(ESAS2R_LOG_INFO, &(dev->sdev_gendev),
-                      "esas2r_slave_configure()");
-
-       if (dev->tagged_supported) {
-               scsi_set_tag_type(dev, MSG_SIMPLE_TAG);
-               scsi_activate_tcq(dev, cmd_per_lun);
-       } else {
-               scsi_set_tag_type(dev, 0);
-               scsi_deactivate_tcq(dev, cmd_per_lun);
-       }
-
-       return 0;
-}
-
-void esas2r_slave_destroy(struct scsi_device *dev)
-{
-       esas2r_log_dev(ESAS2R_LOG_INFO, &(dev->sdev_gendev),
-                      "esas2r_slave_destroy()");
-}
-
 void esas2r_log_request_failure(struct esas2r_adapter *a,
                                struct esas2r_request *rq)
 {