aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/scsi/zfcp_scsi.c')
-rw-r--r--drivers/s390/scsi/zfcp_scsi.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 179bf3d8af6c..75f4bfc2b98a 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -32,13 +32,6 @@ static bool allow_lun_scan = 1;
32module_param(allow_lun_scan, bool, 0600); 32module_param(allow_lun_scan, bool, 0600);
33MODULE_PARM_DESC(allow_lun_scan, "For NPIV, scan and attach all storage LUNs"); 33MODULE_PARM_DESC(allow_lun_scan, "For NPIV, scan and attach all storage LUNs");
34 34
35static int zfcp_scsi_change_queue_depth(struct scsi_device *sdev, int depth,
36 int reason)
37{
38 scsi_adjust_queue_depth(sdev, depth);
39 return sdev->queue_depth;
40}
41
42static void zfcp_scsi_slave_destroy(struct scsi_device *sdev) 35static void zfcp_scsi_slave_destroy(struct scsi_device *sdev)
43{ 36{
44 struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev); 37 struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
@@ -54,7 +47,7 @@ static void zfcp_scsi_slave_destroy(struct scsi_device *sdev)
54static int zfcp_scsi_slave_configure(struct scsi_device *sdp) 47static int zfcp_scsi_slave_configure(struct scsi_device *sdp)
55{ 48{
56 if (sdp->tagged_supported) 49 if (sdp->tagged_supported)
57 scsi_adjust_queue_depth(sdp, default_depth); 50 scsi_change_queue_depth(sdp, default_depth);
58 return 0; 51 return 0;
59} 52}
60 53
@@ -293,7 +286,7 @@ static struct scsi_host_template zfcp_scsi_host_template = {
293 .slave_alloc = zfcp_scsi_slave_alloc, 286 .slave_alloc = zfcp_scsi_slave_alloc,
294 .slave_configure = zfcp_scsi_slave_configure, 287 .slave_configure = zfcp_scsi_slave_configure,
295 .slave_destroy = zfcp_scsi_slave_destroy, 288 .slave_destroy = zfcp_scsi_slave_destroy,
296 .change_queue_depth = zfcp_scsi_change_queue_depth, 289 .change_queue_depth = scsi_change_queue_depth,
297 .proc_name = "zfcp", 290 .proc_name = "zfcp",
298 .can_queue = 4096, 291 .can_queue = 4096,
299 .this_id = -1, 292 .this_id = -1,