Skip to content

Commit c4a9c8e

Browse files
Michal Swiatkowskianguy11
authored andcommitted
ice: don't ignore return codes in VSI related code
There were few smatch warnings reported by Dan: - ice_vsi_cfg_xdp_txqs can return 0 instead of ret, which is cleaner - return values in ice_vsi_cfg_def were ignored - in ice_vsi_rebuild return value was ignored in case rebuild failed, it was a never reached code, however, rewrite it for clarity. - ice_vsi_cfg_tc can return 0 instead of ret Fixes: 6624e78 ("ice: split ice_vsi_setup into smaller functions") Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Michal Swiatkowski <[email protected]> Tested-by: Gurucharan G <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent fef3f92 commit c4a9c8e

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

drivers/net/ethernet/intel/ice/ice_lib.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,7 @@ int ice_vsi_cfg_xdp_txqs(struct ice_vsi *vsi)
21262126
ice_for_each_rxq(vsi, i)
21272127
ice_tx_xsk_pool(vsi, i);
21282128

2129-
return ret;
2129+
return 0;
21302130
}
21312131

21322132
/**
@@ -2693,12 +2693,14 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vsi_cfg_params *params)
26932693
return ret;
26942694

26952695
/* allocate memory for Tx/Rx ring stat pointers */
2696-
if (ice_vsi_alloc_stat_arrays(vsi))
2696+
ret = ice_vsi_alloc_stat_arrays(vsi);
2697+
if (ret)
26972698
goto unroll_vsi_alloc;
26982699

26992700
ice_alloc_fd_res(vsi);
27002701

2701-
if (ice_vsi_get_qs(vsi)) {
2702+
ret = ice_vsi_get_qs(vsi);
2703+
if (ret) {
27022704
dev_err(dev, "Failed to allocate queues. vsi->idx = %d\n",
27032705
vsi->idx);
27042706
goto unroll_vsi_alloc_stat;
@@ -2811,6 +2813,7 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vsi_cfg_params *params)
28112813
break;
28122814
default:
28132815
/* clean up the resources and exit */
2816+
ret = -EINVAL;
28142817
goto unroll_vsi_init;
28152818
}
28162819

@@ -3508,10 +3511,10 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags)
35083511
if (vsi_flags & ICE_VSI_FLAG_INIT) {
35093512
ret = -EIO;
35103513
goto err_vsi_cfg_tc_lan;
3511-
} else {
3512-
kfree(coalesce);
3513-
return ice_schedule_reset(pf, ICE_RESET_PFR);
35143514
}
3515+
3516+
kfree(coalesce);
3517+
return ice_schedule_reset(pf, ICE_RESET_PFR);
35153518
}
35163519

35173520
ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq);
@@ -3759,7 +3762,7 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc)
37593762
dev = ice_pf_to_dev(pf);
37603763
if (vsi->tc_cfg.ena_tc == ena_tc &&
37613764
vsi->mqprio_qopt.mode != TC_MQPRIO_MODE_CHANNEL)
3762-
return ret;
3765+
return 0;
37633766

37643767
ice_for_each_traffic_class(i) {
37653768
/* build bitmap of enabled TCs */

0 commit comments

Comments
 (0)