scsi: don't set tagging state from scsi_adjust_queue_depth

Remove the tagged argument from scsi_adjust_queue_depth, and just let it
handle the queue depth.  For most drivers those two are fairly separate,
given that most modern drivers don't care about the SCSI "tagged" status
of a command at all, and many old drivers allow queuing of multiple
untagged commands in the driver.

Instead we start out with the ->simple_tags flag set before calling
->slave_configure, which is how all drivers actually looking at
->simple_tags except for one worke anyway.  The one other case looks
broken, but I've kept the behavior as-is for now.

Except for that we only change ->simple_tags from the ->change_queue_type,
and when rejecting a tag message in a single driver, so keeping this
churn out of scsi_adjust_queue_depth is a clear win.

Now that the usage of scsi_adjust_queue_depth is more obvious we can
also remove all the trivial instances in ->slave_alloc or ->slave_configure
that just set it to the cmd_per_lun default.

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

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 6369f9a282f1..844c9a048c00 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -2185,9 +2185,16 @@ static int dc390_slave_configure(struct scsi_device *sdev)
         struct dc390_dcb *dcb = (struct dc390_dcb *)sdev->hostdata;
 
         acb->scan_devices = 0;
+
+        /*
+         * XXX: Note that while this driver used to called scsi_activate_tcq,
+         * it never actually set a tag type, so emulate the old behavior.
+         */
+        scsi_set_tag_type(sdev, 0);
+
         if (sdev->tagged_supported && (dcb->DevMode & TAG_QUEUEING_)) {
                 dcb->SyncMode |= EN_TAG_QUEUEING;
-                scsi_adjust_queue_depth(sdev, 0, acb->TagMaxNum);
+                scsi_adjust_queue_depth(sdev, acb->TagMaxNum);
         }
 
         return 0;