diff options
author | Karen Higgins <karen.higgins@qlogic.com> | 2013-01-20 23:50:59 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-01-29 21:43:50 -0500 |
commit | ff4108dce9e82acbde8e8b1899aaa4d91bf504b7 (patch) | |
tree | 28fe6ba2c91d7351b3738be0f2b89b2e81bf53e5 | |
parent | 026fbd3aaae796d2457898497374b68f3477ee2f (diff) |
[SCSI] qla4xxx: Remove unnecessary code from qla4xxx_init_local_data
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>
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_init.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c index 2045fd79095f..8fc8548ba4ba 100644 --- a/drivers/scsi/qla4xxx/ql4_init.c +++ b/drivers/scsi/qla4xxx/ql4_init.c | |||
@@ -195,12 +195,10 @@ exit_get_sys_info_no_free: | |||
195 | * @ha: pointer to host adapter structure. | 195 | * @ha: pointer to host adapter structure. |
196 | * | 196 | * |
197 | **/ | 197 | **/ |
198 | static int qla4xxx_init_local_data(struct scsi_qla_host *ha) | 198 | static void qla4xxx_init_local_data(struct scsi_qla_host *ha) |
199 | { | 199 | { |
200 | /* Initialize aen queue */ | 200 | /* Initialize aen queue */ |
201 | ha->aen_q_count = MAX_AEN_ENTRIES; | 201 | ha->aen_q_count = MAX_AEN_ENTRIES; |
202 | |||
203 | return qla4xxx_get_firmware_status(ha); | ||
204 | } | 202 | } |
205 | 203 | ||
206 | static uint8_t | 204 | static uint8_t |
@@ -951,8 +949,7 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha, int is_reset) | |||
951 | if (ha->isp_ops->get_sys_info(ha) == QLA_ERROR) | 949 | if (ha->isp_ops->get_sys_info(ha) == QLA_ERROR) |
952 | goto exit_init_hba; | 950 | goto exit_init_hba; |
953 | 951 | ||
954 | if (qla4xxx_init_local_data(ha) == QLA_ERROR) | 952 | qla4xxx_init_local_data(ha); |
955 | goto exit_init_hba; | ||
956 | 953 | ||
957 | status = qla4xxx_init_firmware(ha); | 954 | status = qla4xxx_init_firmware(ha); |
958 | if (status == QLA_ERROR) | 955 | if (status == QLA_ERROR) |