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, 2 insertions, 5 deletions

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 43761c1c46f0..ae4840e4c1c5 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -7706,7 +7706,7 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
                                 asc_dvc->cfg->can_tagged_qng |= tid_bit;
                                 asc_dvc->use_tagged_qng |= tid_bit;
                         }
-                        scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG,
+                        scsi_adjust_queue_depth(sdev, 
                                                 asc_dvc->max_dvc_qng[sdev->id]);
                 }
         } else {
@@ -7714,7 +7714,6 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
                         asc_dvc->cfg->can_tagged_qng &= ~tid_bit;
                         asc_dvc->use_tagged_qng &= ~tid_bit;
                 }
-                scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
         }
 
         if ((sdev->lun == 0) &&
@@ -7849,10 +7848,8 @@ advansys_wide_slave_configure(struct scsi_device *sdev, ADV_DVC_VAR *adv_dvc)
         }
 
         if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported) {
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG,
+                scsi_adjust_queue_depth(sdev,
                                         adv_dvc->max_dvc_qng);
-        } else {
-                scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
         }
 }