ID: 50 - ipmi_hpmfwupg needs a clean up

HpmfwupgUploadFirmwareBlock() - kill a bit of indent by re-writing one if().
This commit is contained in:
Zdenek Styblik 2013-10-10 11:42:32 +00:00
parent 18aadc30d0
commit 6de0796079

View File

@ -1867,7 +1867,10 @@ HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf,
/* 2 is the size of the upload struct - data */ /* 2 is the size of the upload struct - data */
req.msg.data_len = 2 + count; req.msg.data_len = 2 + count;
rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
if (rsp) { if (rsp == NULL) {
lprintf(LOG_NOTICE, "Error uploading firmware block.");
return HPMFWUPG_ERROR;
}
if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS
|| rsp->ccode == 0x00) { || rsp->ccode == 0x00) {
/* /*
@ -1915,18 +1918,14 @@ HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf,
*/ */
rc = HPMFWUPG_UPLOAD_BLOCK_LENGTH; rc = HPMFWUPG_UPLOAD_BLOCK_LENGTH;
} else { } else {
lprintf(LOG_NOTICE,"Error uploading firmware block"); lprintf(LOG_ERR, "Error uploading firmware block");
lprintf(LOG_NOTICE,"compcode=0x%x: %s", lprintf(LOG_ERR, "compcode=0x%x: %s",
rsp->ccode, rsp->ccode,
val2str(rsp->ccode, val2str(rsp->ccode,
completion_code_vals)); completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
} else {
lprintf(LOG_NOTICE, "Error uploading firmware block\n");
rc = HPMFWUPG_ERROR;
}
return rc; return rc;
} }