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/qla2xxx/qla_os.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/qla2xxx/qla_os.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 20049b176b64..6b4d9235368a 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -236,7 +236,6 @@ static int qla2xxx_eh_target_reset(struct scsi_cmnd *); | |||
| 236 | static int qla2xxx_eh_bus_reset(struct scsi_cmnd *); | 236 | static int qla2xxx_eh_bus_reset(struct scsi_cmnd *); |
| 237 | static int qla2xxx_eh_host_reset(struct scsi_cmnd *); | 237 | static int qla2xxx_eh_host_reset(struct scsi_cmnd *); |
| 238 | 238 | ||
| 239 | static int qla2x00_change_queue_depth(struct scsi_device *, int, int); | ||
| 240 | static void qla2x00_clear_drv_active(struct qla_hw_data *); | 239 | static void qla2x00_clear_drv_active(struct qla_hw_data *); |
| 241 | static void qla2x00_free_device(scsi_qla_host_t *); | 240 | static void qla2x00_free_device(scsi_qla_host_t *); |
| 242 | static void qla83xx_disable_laser(scsi_qla_host_t *vha); | 241 | static void qla83xx_disable_laser(scsi_qla_host_t *vha); |
| @@ -258,7 +257,7 @@ struct scsi_host_template qla2xxx_driver_template = { | |||
| 258 | .slave_destroy = qla2xxx_slave_destroy, | 257 | .slave_destroy = qla2xxx_slave_destroy, |
| 259 | .scan_finished = qla2xxx_scan_finished, | 258 | .scan_finished = qla2xxx_scan_finished, |
| 260 | .scan_start = qla2xxx_scan_start, | 259 | .scan_start = qla2xxx_scan_start, |
| 261 | .change_queue_depth = qla2x00_change_queue_depth, | 260 | .change_queue_depth = scsi_change_queue_depth, |
| 262 | .change_queue_type = scsi_change_queue_type, | 261 | .change_queue_type = scsi_change_queue_type, |
| 263 | .this_id = -1, | 262 | .this_id = -1, |
| 264 | .cmd_per_lun = 3, | 263 | .cmd_per_lun = 3, |
| @@ -1406,7 +1405,7 @@ qla2xxx_slave_configure(struct scsi_device *sdev) | |||
| 1406 | if (IS_T10_PI_CAPABLE(vha->hw)) | 1405 | if (IS_T10_PI_CAPABLE(vha->hw)) |
| 1407 | blk_queue_update_dma_alignment(sdev->request_queue, 0x7); | 1406 | blk_queue_update_dma_alignment(sdev->request_queue, 0x7); |
| 1408 | 1407 | ||
| 1409 | scsi_adjust_queue_depth(sdev, req->max_q_depth); | 1408 | scsi_change_queue_depth(sdev, req->max_q_depth); |
| 1410 | return 0; | 1409 | return 0; |
| 1411 | } | 1410 | } |
| 1412 | 1411 | ||
| @@ -1416,13 +1415,6 @@ qla2xxx_slave_destroy(struct scsi_device *sdev) | |||
| 1416 | sdev->hostdata = NULL; | 1415 | sdev->hostdata = NULL; |
| 1417 | } | 1416 | } |
| 1418 | 1417 | ||
| 1419 | static int | ||
| 1420 | qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason) | ||
| 1421 | { | ||
| 1422 | scsi_adjust_queue_depth(sdev, qdepth); | ||
| 1423 | return sdev->queue_depth; | ||
| 1424 | } | ||
| 1425 | |||
| 1426 | /** | 1418 | /** |
| 1427 | * qla2x00_config_dma_addressing() - Configure OS DMA addressing method. | 1419 | * qla2x00_config_dma_addressing() - Configure OS DMA addressing method. |
| 1428 | * @ha: HA context | 1420 | * @ha: HA context |