aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt3sas/mpt3sas_scsih.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_scsih.c')
-rw-r--r--drivers/scsi/mpt3sas/mpt3sas_scsih.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 568dcaed36cb..de175b9915e2 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -1090,20 +1090,18 @@ _scsih_adjust_queue_depth(struct scsi_device *sdev, int qdepth)
1090 max_depth = 1; 1090 max_depth = 1;
1091 if (qdepth > max_depth) 1091 if (qdepth > max_depth)
1092 qdepth = max_depth; 1092 qdepth = max_depth;
1093 scsi_adjust_queue_depth(sdev, qdepth); 1093 scsi_change_queue_depth(sdev, qdepth);
1094} 1094}
1095 1095
1096/** 1096/**
1097 * _scsih_change_queue_depth - setting device queue depth 1097 * _scsih_change_queue_depth - setting device queue depth
1098 * @sdev: scsi device struct 1098 * @sdev: scsi device struct
1099 * @qdepth: requested queue depth 1099 * @qdepth: requested queue depth
1100 * @reason: SCSI_QDEPTH_DEFAULT
1101 * (see include/scsi/scsi_host.h for definition)
1102 * 1100 *
1103 * Returns queue depth. 1101 * Returns queue depth.
1104 */ 1102 */
1105static int 1103static int
1106_scsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason) 1104_scsih_change_queue_depth(struct scsi_device *sdev, int qdepth)
1107{ 1105{
1108 _scsih_adjust_queue_depth(sdev, qdepth); 1106 _scsih_adjust_queue_depth(sdev, qdepth);
1109 1107
@@ -1734,7 +1732,7 @@ _scsih_slave_configure(struct scsi_device *sdev)
1734 raid_device->num_pds, ds); 1732 raid_device->num_pds, ds);
1735 1733
1736 1734
1737 _scsih_change_queue_depth(sdev, qdepth, SCSI_QDEPTH_DEFAULT); 1735 _scsih_change_queue_depth(sdev, qdepth);
1738 1736
1739/* raid transport support */ 1737/* raid transport support */
1740 _scsih_set_level(sdev, raid_device->volume_type); 1738 _scsih_set_level(sdev, raid_device->volume_type);
@@ -1800,7 +1798,7 @@ _scsih_slave_configure(struct scsi_device *sdev)
1800 _scsih_display_sata_capabilities(ioc, handle, sdev); 1798 _scsih_display_sata_capabilities(ioc, handle, sdev);
1801 1799
1802 1800
1803 _scsih_change_queue_depth(sdev, qdepth, SCSI_QDEPTH_DEFAULT); 1801 _scsih_change_queue_depth(sdev, qdepth);
1804 1802
1805 if (ssp_target) { 1803 if (ssp_target) {
1806 sas_read_port_mode_page(sdev); 1804 sas_read_port_mode_page(sdev);