Skip to content

Commit c314a01

Browse files
ematsumiyamartinkpetersen
authored andcommitted
scsi: qla2xxx: Use MBX_TOV_SECONDS for mailbox command timeout values
Improves readability of qla_mbx.c. Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Reviewed-by: Roman Bolshakov <[email protected]> Signed-off-by: Enzo Matsumiya <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 223f91b commit c314a01

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/scsi/qla2xxx/qla_mbx.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5240,7 +5240,7 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
52405240
mcp->mb[8] = MSW(risc_addr);
52415241
mcp->out_mb = MBX_8|MBX_1|MBX_0;
52425242
mcp->in_mb = MBX_3|MBX_2|MBX_0;
5243-
mcp->tov = 30;
5243+
mcp->tov = MBX_TOV_SECONDS;
52445244
mcp->flags = 0;
52455245
rval = qla2x00_mailbox_command(vha, mcp);
52465246
if (rval != QLA_SUCCESS) {
@@ -5428,7 +5428,7 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
54285428
mcp->mb[8] = MSW(risc_addr);
54295429
mcp->out_mb = MBX_8|MBX_3|MBX_2|MBX_1|MBX_0;
54305430
mcp->in_mb = MBX_1|MBX_0;
5431-
mcp->tov = 30;
5431+
mcp->tov = MBX_TOV_SECONDS;
54325432
mcp->flags = 0;
54335433
rval = qla2x00_mailbox_command(vha, mcp);
54345434
if (rval != QLA_SUCCESS) {
@@ -5700,7 +5700,7 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
57005700
mcp->mb[9] = vha->vp_idx;
57015701
mcp->out_mb = MBX_9|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
57025702
mcp->in_mb = MBX_4|MBX_3|MBX_1|MBX_0;
5703-
mcp->tov = 30;
5703+
mcp->tov = MBX_TOV_SECONDS;
57045704
mcp->flags = 0;
57055705
rval = qla2x00_mailbox_command(vha, mcp);
57065706
if (mb != NULL) {
@@ -5787,7 +5787,7 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
57875787

57885788
mcp->out_mb = MBX_1|MBX_0;
57895789
mcp->in_mb = MBX_0;
5790-
mcp->tov = 30;
5790+
mcp->tov = MBX_TOV_SECONDS;
57915791
mcp->flags = 0;
57925792

57935793
rval = qla2x00_mailbox_command(vha, mcp);
@@ -5822,7 +5822,7 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
58225822

58235823
mcp->out_mb = MBX_1|MBX_0;
58245824
mcp->in_mb = MBX_0;
5825-
mcp->tov = 30;
5825+
mcp->tov = MBX_TOV_SECONDS;
58265826
mcp->flags = 0;
58275827

58285828
rval = qla2x00_mailbox_command(vha, mcp);
@@ -6014,7 +6014,7 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
60146014
if (IS_QLA8031(ha))
60156015
mcp->out_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
60166016
mcp->in_mb = MBX_0;
6017-
mcp->tov = 30;
6017+
mcp->tov = MBX_TOV_SECONDS;
60186018
mcp->flags = 0;
60196019

60206020
rval = qla2x00_mailbox_command(vha, mcp);
@@ -6050,7 +6050,7 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
60506050
mcp->in_mb = MBX_2|MBX_1|MBX_0;
60516051
if (IS_QLA8031(ha))
60526052
mcp->in_mb |= MBX_6|MBX_5|MBX_4|MBX_3;
6053-
mcp->tov = 30;
6053+
mcp->tov = MBX_TOV_SECONDS;
60546054
mcp->flags = 0;
60556055

60566056
rval = qla2x00_mailbox_command(vha, mcp);

0 commit comments

Comments
 (0)