diff options
author | Christoph Hellwig <hch@lst.de> | 2014-11-13 09:08:42 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-11-24 08:45:27 -0500 |
commit | db5ed4dfd5dd0142ec36ff7b335e0ec3b836b3e6 (patch) | |
tree | 6cae824b5c9e5a7fd9d213e3f9c2b1c7dc8b7b8a /drivers/scsi/esas2r/esas2r_main.c | |
parent | 1e6f2416044c062a56091ebf8d76760956dd5872 (diff) |
scsi: drop reason argument from ->change_queue_depth
Drop the now unused reason argument from the ->change_queue_depth method.
Also add a return value to scsi_adjust_queue_depth, and rename it to
scsi_change_queue_depth now that it can be used as the default
->change_queue_depth implementation.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'drivers/scsi/esas2r/esas2r_main.c')
-rw-r--r-- | drivers/scsi/esas2r/esas2r_main.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c index 30fce64faf75..593ff8a63c70 100644 --- a/drivers/scsi/esas2r/esas2r_main.c +++ b/drivers/scsi/esas2r/esas2r_main.c | |||
@@ -254,7 +254,7 @@ static struct scsi_host_template driver_template = { | |||
254 | .use_clustering = ENABLE_CLUSTERING, | 254 | .use_clustering = ENABLE_CLUSTERING, |
255 | .emulated = 0, | 255 | .emulated = 0, |
256 | .proc_name = ESAS2R_DRVR_NAME, | 256 | .proc_name = ESAS2R_DRVR_NAME, |
257 | .change_queue_depth = esas2r_change_queue_depth, | 257 | .change_queue_depth = scsi_change_queue_depth, |
258 | .change_queue_type = scsi_change_queue_type, | 258 | .change_queue_type = scsi_change_queue_type, |
259 | .max_sectors = 0xFFFF, | 259 | .max_sectors = 0xFFFF, |
260 | .use_blk_tags = 1, | 260 | .use_blk_tags = 1, |
@@ -1257,15 +1257,6 @@ int esas2r_target_reset(struct scsi_cmnd *cmd) | |||
1257 | return esas2r_dev_targ_reset(cmd, true); | 1257 | return esas2r_dev_targ_reset(cmd, true); |
1258 | } | 1258 | } |
1259 | 1259 | ||
1260 | int esas2r_change_queue_depth(struct scsi_device *dev, int depth, int reason) | ||
1261 | { | ||
1262 | esas2r_log(ESAS2R_LOG_INFO, "change_queue_depth %p, %d", dev, depth); | ||
1263 | |||
1264 | scsi_adjust_queue_depth(dev, depth); | ||
1265 | |||
1266 | return dev->queue_depth; | ||
1267 | } | ||
1268 | |||
1269 | void esas2r_log_request_failure(struct esas2r_adapter *a, | 1260 | void esas2r_log_request_failure(struct esas2r_adapter *a, |
1270 | struct esas2r_request *rq) | 1261 | struct esas2r_request *rq) |
1271 | { | 1262 | { |