diff options
author | Christoph Hellwig <hch@lst.de> | 2014-11-13 08:25:11 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-11-24 08:45:12 -0500 |
commit | c40ecc12cfdb630332198a04e2832ae8218a61f1 (patch) | |
tree | 881456a7d46ca017dba4cc003e2fe1be427614fc /drivers/scsi/ufs | |
parent | 89dac7bb3b0494685241369951f95494e86ee61f (diff) |
scsi: avoid ->change_queue_depth indirection for queue full tracking
All drivers use the implementation for ramping the queue up and down, so
instead of overloading the change_queue_depth method call the
implementation diretly if the driver opts into it by setting the
track_queue_depth flag in the host template.
Note that a few drivers validated the new queue depth in their
change_queue_depth method, but as we never go over the queue depth
set during slave_configure or the sysfs file this isn't nessecary
and can safely be removed.
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: Venkatesh Srinivas <venkateshs@google.com>
Diffstat (limited to 'drivers/scsi/ufs')
-rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 362b818ad827..e96ab253e3e5 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c | |||
@@ -2800,18 +2800,7 @@ static int ufshcd_change_queue_depth(struct scsi_device *sdev, | |||
2800 | if (depth > hba->nutrs) | 2800 | if (depth > hba->nutrs) |
2801 | depth = hba->nutrs; | 2801 | depth = hba->nutrs; |
2802 | 2802 | ||
2803 | switch (reason) { | 2803 | scsi_adjust_queue_depth(sdev, depth); |
2804 | case SCSI_QDEPTH_DEFAULT: | ||
2805 | case SCSI_QDEPTH_RAMP_UP: | ||
2806 | scsi_adjust_queue_depth(sdev, depth); | ||
2807 | break; | ||
2808 | case SCSI_QDEPTH_QFULL: | ||
2809 | scsi_track_queue_full(sdev, depth); | ||
2810 | break; | ||
2811 | default: | ||
2812 | return -EOPNOTSUPP; | ||
2813 | } | ||
2814 | |||
2815 | return depth; | 2804 | return depth; |
2816 | } | 2805 | } |
2817 | 2806 | ||
@@ -4231,6 +4220,7 @@ static struct scsi_host_template ufshcd_driver_template = { | |||
4231 | .can_queue = UFSHCD_CAN_QUEUE, | 4220 | .can_queue = UFSHCD_CAN_QUEUE, |
4232 | .max_host_blocked = 1, | 4221 | .max_host_blocked = 1, |
4233 | .use_blk_tags = 1, | 4222 | .use_blk_tags = 1, |
4223 | .track_queue_depth = 1, | ||
4234 | }; | 4224 | }; |
4235 | 4225 | ||
4236 | static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg, | 4226 | static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg, |