1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 78ca63dfba4a..dd0d516f65e2 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -266,10 +266,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
          */
         sdev->borken = 1;
 
-        if (shost_use_blk_mq(shost))
-                sdev->request_queue = scsi_mq_alloc_queue(sdev);
-        else
-                sdev->request_queue = scsi_old_alloc_queue(sdev);
+        sdev->request_queue = scsi_mq_alloc_queue(sdev);
         if (!sdev->request_queue) {
                 /* release fn is set up in scsi_sysfs_device_initialise, so
                  * have to free and put manually here */
@@ -280,11 +277,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
         WARN_ON_ONCE(!blk_get_queue(sdev->request_queue));
         sdev->request_queue->queuedata = sdev;
 
-        if (!shost_use_blk_mq(sdev->host)) {
-                blk_queue_init_tags(sdev->request_queue,
-                                    sdev->host->cmd_per_lun, shost->bqt,
-                                    shost->hostt->tag_alloc_policy);
-        }
         scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun ?
                                         sdev->host->cmd_per_lun : 1);