d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc/base: fix PreFAST warnings because of unused return

Browse Source 
Fixes: 19b64c6ac3 ("net/sfc/base: import libefx base")
Fixes: d96a34d165 ("net/sfc/base: import NVRAM support")
Fixes: e7cd430c86 ("net/sfc/base: import SFN7xxx family support")
Cc: stable@dpdk.org

Signed-off-by: Martin Harvey <mharvey@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Martin Harvey 2018-09-10 10:33:00 +01:00 committed by Ferruh Yigit
parent 30f77abecd
commit f394c63d2d
6 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/sfc/base/ef10_filter.c
View File

@ -1144,12 +1144,15 @@ ef10_filter_insert_unicast(
efx_filter_spec_init_rx(&spec, EFX_FILTER_PRI_AUTO,
filter_flags,
eftp->eft_default_rxq);
efx_filter_spec_set_eth_local(&spec, EFX_FILTER_SPEC_VID_UNSPEC, addr);
rc = efx_filter_spec_set_eth_local(&spec, EFX_FILTER_SPEC_VID_UNSPEC,
addr);
if (rc != 0)
goto fail1;
rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
&eftp->eft_unicst_filter_indexes[eftp->eft_unicst_filter_count]);
if (rc != 0)
goto fail1;
goto fail2;
eftp->eft_unicst_filter_count++;
EFSYS_ASSERT(eftp->eft_unicst_filter_count <=
@ -1157,6 +1160,8 @@ ef10_filter_insert_unicast(
return (0);
fail2:
EFSYS_PROBE(fail2);
fail1:
EFSYS_PROBE1(fail1, efx_rc_t, rc);
return (rc);
@ -1175,11 +1180,13 @@ ef10_filter_insert_all_unicast(
efx_filter_spec_init_rx(&spec, EFX_FILTER_PRI_AUTO,
filter_flags,
eftp->eft_default_rxq);
efx_filter_spec_set_uc_def(&spec);
rc = efx_filter_spec_set_uc_def(&spec);
if (rc != 0)
goto fail1;
rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
&eftp->eft_unicst_filter_indexes[eftp->eft_unicst_filter_count]);
if (rc != 0)
goto fail1;
goto fail2;
eftp->eft_unicst_filter_count++;
EFSYS_ASSERT(eftp->eft_unicst_filter_count <=
@ -1187,6 +1194,8 @@ ef10_filter_insert_all_unicast(
return (0);
fail2:
EFSYS_PROBE(fail2);
fail1:
EFSYS_PROBE1(fail1, efx_rc_t, rc);
return (rc);
@ -1228,9 +1237,21 @@ ef10_filter_insert_multicast_list(
filter_flags,
eftp->eft_default_rxq);
efx_filter_spec_set_eth_local(&spec,
rc = efx_filter_spec_set_eth_local(&spec,
EFX_FILTER_SPEC_VID_UNSPEC,
&addrs[i * EFX_MAC_ADDR_LEN]);
if (rc != 0) {
if (rollback == B_TRUE) {
/* Only stop upon failure if told to rollback */
goto rollback;
} else {
/*
* Don't try to add a filter with a corrupt
* specification.
*/
continue;
}
}
rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
&filter_index);
@ -1253,8 +1274,12 @@ ef10_filter_insert_multicast_list(
eftp->eft_default_rxq);
EFX_MAC_BROADCAST_ADDR_SET(addr);
efx_filter_spec_set_eth_local(&spec, EFX_FILTER_SPEC_VID_UNSPEC,
addr);
rc = efx_filter_spec_set_eth_local(&spec,
EFX_FILTER_SPEC_VID_UNSPEC, addr);
if ((rc != 0) && (rollback == B_TRUE)) {
/* Only stop upon failure if told to rollback */
goto rollback;
}
rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
&filter_index);
@ -1302,12 +1327,14 @@ ef10_filter_insert_all_multicast(
efx_filter_spec_init_rx(&spec, EFX_FILTER_PRI_AUTO,
filter_flags,
eftp->eft_default_rxq);
efx_filter_spec_set_mc_def(&spec);
rc = efx_filter_spec_set_mc_def(&spec);
if (rc != 0)
goto fail1;
rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
&eftp->eft_mulcst_filter_indexes[0]);
if (rc != 0)
goto fail1;
goto fail2;
eftp->eft_mulcst_filter_count = 1;
eftp->eft_using_all_mulcst = B_TRUE;
@ -1318,6 +1345,8 @@ ef10_filter_insert_all_multicast(
return (0);
fail2:
EFSYS_PROBE(fail2);
fail1:
EFSYS_PROBE1(fail1, efx_rc_t, rc);

2
drivers/net/sfc/base/ef10_mac.c
View File

@ -412,7 +412,7 @@ ef10_mac_filter_default_rxq_clear(
ef10_filter_default_rxq_clear(enp);
efx_filter_reconfigure(enp, epp->ep_mac_addr,
(void) efx_filter_reconfigure(enp, epp->ep_mac_addr,
epp->ep_all_unicst, epp->ep_mulcst,
epp->ep_all_mulcst, epp->ep_brdcst,
epp->ep_mulcst_addr_list,

4
drivers/net/sfc/base/ef10_nic.c
View File

@ -806,7 +806,7 @@ ef10_nic_alloc_piobufs(
for (i = 0; i < enp->en_arch.ef10.ena_piobuf_count; i++) {
handlep = &enp->en_arch.ef10.ena_piobuf_handle[i];
efx_mcdi_free_piobuf(enp, *handlep);
(void) efx_mcdi_free_piobuf(enp, *handlep);
*handlep = EFX_PIOBUF_HANDLE_INVALID;
}
enp->en_arch.ef10.ena_piobuf_count = 0;
@ -823,7 +823,7 @@ ef10_nic_free_piobufs(
for (i = 0; i < enp->en_arch.ef10.ena_piobuf_count; i++) {
handlep = &enp->en_arch.ef10.ena_piobuf_handle[i];
efx_mcdi_free_piobuf(enp, *handlep);
(void) efx_mcdi_free_piobuf(enp, *handlep);
*handlep = EFX_PIOBUF_HANDLE_INVALID;
}
enp->en_arch.ef10.ena_piobuf_count = 0;

4
drivers/net/sfc/base/ef10_nvram.c
View File

@ -1808,7 +1808,7 @@ ef10_nvram_partn_write_segment_tlv(
goto fail7;
/* Unlock the partition */
ef10_nvram_partn_unlock(enp, partn, NULL);
(void) ef10_nvram_partn_unlock(enp, partn, NULL);
EFSYS_KMEM_FREE(enp->en_esip, partn_size, partn_data);
@ -1823,7 +1823,7 @@ ef10_nvram_partn_write_segment_tlv(
fail4:
EFSYS_PROBE(fail4);
ef10_nvram_partn_unlock(enp, partn, NULL);
(void) ef10_nvram_partn_unlock(enp, partn, NULL);
fail3:
EFSYS_PROBE(fail3);

8
drivers/net/sfc/base/ef10_tx.c
View File

@ -278,7 +278,7 @@ ef10_tx_qpio_enable(
fail3:
EFSYS_PROBE(fail3);
ef10_nic_pio_free(enp, etp->et_pio_bufnum, etp->et_pio_blknum);
(void) ef10_nic_pio_free(enp, etp->et_pio_bufnum, etp->et_pio_blknum);
fail2:
EFSYS_PROBE(fail2);
etp->et_pio_size = 0;
@ -296,10 +296,12 @@ ef10_tx_qpio_disable(
if (etp->et_pio_size != 0) {
/* Unlink the piobuf from this TXQ */
ef10_nic_pio_unlink(enp, etp->et_index);
if (ef10_nic_pio_unlink(enp, etp->et_index) != 0)
return;
/* Free the sub-allocated PIO block */
ef10_nic_pio_free(enp, etp->et_pio_bufnum, etp->et_pio_blknum);
(void) ef10_nic_pio_free(enp, etp->et_pio_bufnum,
etp->et_pio_blknum);
etp->et_pio_size = 0;
etp->et_pio_write_offset = 0;
}

2
drivers/net/sfc/base/efx_port.c
View File

@ -37,7 +37,7 @@ efx_port_init(
epp->ep_emop->emo_reconfigure(enp);
/* Pick up current phy capababilities */
efx_port_poll(enp, NULL);
(void) efx_port_poll(enp, NULL);
/*
* Turn on the PHY if available, otherwise reset it, and