Skip to content

Commit

Permalink
[SCSI] qla4xxx: Remove unnecessary code from qla4xxx_init_local_data
Browse files Browse the repository at this point in the history
Removed unnecessary calls to qla4xxx_get_firmware_status from
function qla4xxx_init_local_data

Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  • Loading branch information
Karen Higgins authored and James Bottomley committed Jan 30, 2013
1 parent 026fbd3 commit ff4108d
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/scsi/qla4xxx/ql4_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,10 @@ int qla4xxx_get_sys_info(struct scsi_qla_host *ha)
* @ha: pointer to host adapter structure.
*
**/
static int qla4xxx_init_local_data(struct scsi_qla_host *ha)
static void qla4xxx_init_local_data(struct scsi_qla_host *ha)
{
/* Initialize aen queue */
ha->aen_q_count = MAX_AEN_ENTRIES;

return qla4xxx_get_firmware_status(ha);
}

static uint8_t
Expand Down Expand Up @@ -951,8 +949,7 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha, int is_reset)
if (ha->isp_ops->get_sys_info(ha) == QLA_ERROR)
goto exit_init_hba;

if (qla4xxx_init_local_data(ha) == QLA_ERROR)
goto exit_init_hba;
qla4xxx_init_local_data(ha);

status = qla4xxx_init_firmware(ha);
if (status == QLA_ERROR)
Expand Down

0 comments on commit ff4108d

Please sign in to comment.