Commit c314a014 authored by Enzo Matsumiya's avatar Enzo Matsumiya Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Use MBX_TOV_SECONDS for mailbox command timeout values 

Improves readability of qla_mbx.c.

Link: https://lore.kernel.org/r/20200805200546.22497-1-ematsumiya@suse.de


Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: default avatarRoman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 223f91b4

drivers/scsi/qla2xxx/qla_mbx.c

+7 −7
Original line number Diff line number Diff line
@@ -5240,7 +5240,7 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data) 
	mcp->mb[8] = MSW(risc_addr);

	mcp->out_mb = MBX_8|MBX_1|MBX_0;

	mcp->in_mb = MBX_3|MBX_2|MBX_0;

	mcp->tov = 30;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;

	rval = qla2x00_mailbox_command(vha, mcp);

	if (rval != QLA_SUCCESS) {
@@ -5428,7 +5428,7 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data) 
	mcp->mb[8] = MSW(risc_addr);

	mcp->out_mb = MBX_8|MBX_3|MBX_2|MBX_1|MBX_0;

	mcp->in_mb = MBX_1|MBX_0;

	mcp->tov = 30;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;

	rval = qla2x00_mailbox_command(vha, mcp);

	if (rval != QLA_SUCCESS) {
@@ -5700,7 +5700,7 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority, 
	mcp->mb[9] = vha->vp_idx;

	mcp->out_mb = MBX_9|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;

	mcp->in_mb = MBX_4|MBX_3|MBX_1|MBX_0;

	mcp->tov = 30;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;

	rval = qla2x00_mailbox_command(vha, mcp);

	if (mb != NULL) {
@@ -5787,7 +5787,7 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha) 


	mcp->out_mb = MBX_1|MBX_0;

	mcp->in_mb = MBX_0;

	mcp->tov = 30;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;



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


	mcp->out_mb = MBX_1|MBX_0;

	mcp->in_mb = MBX_0;

	mcp->tov = 30;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;



	rval = qla2x00_mailbox_command(vha, mcp);
@@ -6014,7 +6014,7 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg) 
	if (IS_QLA8031(ha))

		mcp->out_mb |= MBX_6|MBX_5|MBX_4|MBX_3;

	mcp->in_mb = MBX_0;

	mcp->tov = 30;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;



	rval = qla2x00_mailbox_command(vha, mcp);
@@ -6050,7 +6050,7 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg) 
	mcp->in_mb = MBX_2|MBX_1|MBX_0;

	if (IS_QLA8031(ha))

		mcp->in_mb |= MBX_6|MBX_5|MBX_4|MBX_3;

	mcp->tov = 30;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;



	rval = qla2x00_mailbox_command(vha, mcp);