mptfusion: don't change queue type in ->change_queue_depth
authorChristoph Hellwig <hch@lst.de>
Mon, 3 Nov 2014 13:49:39 +0000 (14:49 +0100)
committerChristoph Hellwig <hch@lst.de>
Wed, 12 Nov 2014 10:19:42 +0000 (11:19 +0100)
This function shouldn't change the queue type, just the depth.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
drivers/message/fusion/mptscsih.c

index 00bd13dc3dc43d7d3b27a5b3de4abfaaf7bab82b..c0d84a09db9af47767c02a41ab465d7f5e58bbad 100644 (file)
@@ -2322,7 +2322,6 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
        VirtTarget              *vtarget;
        struct scsi_target      *starget;
        int                     max_depth;
-       int                     tagged;
        MPT_ADAPTER             *ioc = hd->ioc;
 
        starget = scsi_target(sdev);
@@ -2347,12 +2346,8 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
 
        if (qdepth > max_depth)
                qdepth = max_depth;
-       if (qdepth == 1)
-               tagged = 0;
-       else
-               tagged = MSG_SIMPLE_TAG;
 
-       scsi_adjust_queue_depth(sdev, tagged, qdepth);
+       scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
        return sdev->queue_depth;
 }