Commit c43e7832 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Change the return type of qla24xx_read_flash_data() 



This change makes it easier to detect qla24xx_read_flash_data() failures
and also to handle such failures. This change does not modify the behavior
of the driver since all callers ignore the qla24xx_read_flash_data()
return value.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent df95f39a

drivers/scsi/qla2xxx/qla_gbl.h

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ fc_port_t *qla2x00_find_fcport_by_nportid(scsi_qla_host_t *, port_id_t *, u8); 
 * Global Function Prototypes in qla_sup.c source file.

 */

extern void qla2x00_release_nvram_protection(scsi_qla_host_t *);

extern uint32_t *qla24xx_read_flash_data(scsi_qla_host_t *, uint32_t *,

extern int qla24xx_read_flash_data(scsi_qla_host_t *, uint32_t *,

    uint32_t, uint32_t);

extern uint8_t *qla2x00_read_nvram_data(scsi_qla_host_t *, void *, uint32_t,

    uint32_t);

drivers/scsi/qla2xxx/qla_sup.c

+5 −3
Original line number Diff line number Diff line
@@ -473,22 +473,24 @@ qla24xx_read_flash_dword(struct qla_hw_data *ha, uint32_t addr, uint32_t *data) 
	return QLA_FUNCTION_TIMEOUT;

}



uint32_t *

int

qla24xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,

    uint32_t dwords)

{

	ulong i;

	int ret = QLA_SUCCESS;

	struct qla_hw_data *ha = vha->hw;



	/* Dword reads to flash. */

	faddr =  flash_data_addr(ha, faddr);

	for (i = 0; i < dwords; i++, faddr++, dwptr++) {

		if (qla24xx_read_flash_dword(ha, faddr, dwptr))

		ret = qla24xx_read_flash_dword(ha, faddr, dwptr);

		if (ret != QLA_SUCCESS)

			break;

		cpu_to_le32s(dwptr);

	}



	return dwptr;

	return ret;

}



static int