Page MenuHomeFreeBSD
Files F143125268

D43178.id131835.diff
No OneTemporary
Actions

D43178.id131835.diff
View Options

diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c
--- a/sys/dev/bnxt/if_bnxt.c
+++ b/sys/dev/bnxt/if_bnxt.c
@@ -2568,15 +2568,13 @@
&find->fw_ver);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_READ:
@@ -2601,22 +2599,20 @@
rd->offset + offset, csize, &dma_data);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
break;
- }
- else {
- copyout(dma_data.idi_vaddr,
+ } else {
+ rc = copyout(dma_data.idi_vaddr,
rd->data + offset, csize);
- iod->hdr.rc = 0;
+ iod->hdr.rc = rc;
}
remain -= csize;
}
- if (iod->hdr.rc == 0)
- copyout(iod, ioh, iol);
+ if (rc == 0)
+ rc = copyout(iod, ioh, iol);
iflib_dma_free(&dma_data);
- rc = 0;
goto exit;
}
case BNXT_HWRM_FW_RESET:
@@ -2628,15 +2624,13 @@
&rst->selfreset);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_FW_QSTATUS:
@@ -2648,15 +2642,13 @@
&qstat->selfreset);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_WRITE:
@@ -2670,15 +2662,14 @@
&wr->item_length, &wr->index);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
}
else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_ERASE_DIR_ENTRY:
@@ -2689,15 +2680,13 @@
rc = bnxt_hwrm_nvm_erase_dir_entry(softc, erase->index);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_GET_DIR_INFO:
@@ -2709,15 +2698,13 @@
&info->entry_length);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_GET_DIR_ENTRIES:
@@ -2734,18 +2721,17 @@
&get->entry_length, &dma_data);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
- copyout(dma_data.idi_vaddr, get->data,
+ } else {
+ rc = copyout(dma_data.idi_vaddr, get->data,
get->entry_length * get->entries);
- iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ iod->hdr.rc = rc;
+ if (rc == 0)
+ rc = copyout(iod, ioh, iol);
}
iflib_dma_free(&dma_data);
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_VERIFY_UPDATE:
@@ -2757,15 +2743,13 @@
vrfy->ordinal, vrfy->ext);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_INSTALL_UPDATE:
@@ -2779,15 +2763,13 @@
&inst->reset_required);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_NVM_MODIFY:
@@ -2798,15 +2780,13 @@
mod->offset, mod->data, true, mod->length);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_FW_GET_TIME:
@@ -2819,15 +2799,13 @@
&gtm->second, &gtm->millisecond, &gtm->zone);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
case BNXT_HWRM_FW_SET_TIME:
@@ -2840,15 +2818,13 @@
stm->second, stm->millisecond, stm->zone);
if (rc) {
iod->hdr.rc = rc;
- copyout(&iod->hdr.rc, &ioh->rc,
+ (void)copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc));
- }
- else {
+ } else {
iod->hdr.rc = 0;
- copyout(iod, ioh, iol);
+ rc = copyout(iod, ioh, iol);
}
- rc = 0;
goto exit;
}
}

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 27, 7:16 AM (14 m, 51 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28052194
Default Alt Text
D43178.id131835.diff (5 KB)

Event Timeline