ice: Change ice_vsi_realloc_stat_arrays() to void
authorTony Nguyen <anthony.l.nguyen@intel.com>
Thu, 5 Jan 2023 19:33:11 +0000 (11:33 -0800)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Tue, 14 Feb 2023 21:08:02 +0000 (13:08 -0800)
smatch reports:

smatch warnings:
drivers/net/ethernet/intel/ice/ice_lib.c:3612 ice_vsi_rebuild() warn: missing error code 'ret'

If an error is encountered for ice_vsi_realloc_stat_arrays(), ret is not
assigned an error value so the goto error path would return success. The
function, however, only returns 0 so an error will never be reported; due
to this, change the function to return void.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
drivers/net/ethernet/intel/ice/ice_lib.c

index 37fe639712e65597dcf203fddabd4b8e216cdad8..8cfc30fc9840302dd4bceaf32f837a61d10fb07c 100644 (file)
@@ -3426,7 +3426,7 @@ ice_vsi_rebuild_set_coalesce(struct ice_vsi *vsi,
  * @prev_txq: Number of Tx rings before ring reallocation
  * @prev_rxq: Number of Rx rings before ring reallocation
  */
-static int
+static void
 ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq)
 {
        struct ice_vsi_stats *vsi_stat;
@@ -3434,9 +3434,9 @@ ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq)
        int i;
 
        if (!prev_txq || !prev_rxq)
-               return 0;
+               return;
        if (vsi->type == ICE_VSI_CHNL)
-               return 0;
+               return;
 
        vsi_stat = pf->vsi_stats[vsi->idx];
 
@@ -3457,8 +3457,6 @@ ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq)
                        }
                }
        }
-
-       return 0;
 }
 
 /**
@@ -3515,8 +3513,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags)
                }
        }
 
-       if (ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq))
-               goto err_vsi_cfg_tc_lan;
+       ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq);
 
        ice_vsi_rebuild_set_coalesce(vsi, coalesce, prev_num_q_vectors);
        kfree(coalesce);