Commit b6b0501d authored by Paul M Stillwell Jr's avatar Paul M Stillwell Jr Committed by Tony Nguyen
Browse files

ice: reduce scope of variables 



There are some places where the scope of a variable can
be reduced so do that.

Signed-off-by: default avatarPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 0c526d44

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

+4 −4
Original line number Diff line number Diff line
@@ -1205,11 +1205,11 @@ static int ice_vsi_setup_vector_base(struct ice_vsi *vsi) 
	num_q_vectors = vsi->num_q_vectors;

	/* reserve slots from OS requested IRQs */

	if (vsi->type == ICE_VSI_CTRL && vsi->vf_id != ICE_INVAL_VFID) {

		struct ice_vf *vf;

		int i;



		ice_for_each_vf(pf, i) {

			vf = &pf->vf[i];

			struct ice_vf *vf = &pf->vf[i];



			if (i != vsi->vf_id && vf->ctrl_vsi_idx != ICE_NO_VSI) {

				base = pf->vsi[vf->ctrl_vsi_idx]->base_vector;

				break;
@@ -2873,11 +2873,11 @@ int ice_vsi_release(struct ice_vsi *vsi) 
	 * cleared in the same manner.

	 */

	if (vsi->type == ICE_VSI_CTRL && vsi->vf_id != ICE_INVAL_VFID) {

		struct ice_vf *vf;

		int i;



		ice_for_each_vf(pf, i) {

			vf = &pf->vf[i];

			struct ice_vf *vf = &pf->vf[i];



			if (i != vsi->vf_id && vf->ctrl_vsi_idx != ICE_NO_VSI)

				break;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -5631,7 +5631,6 @@ ice_update_vsi_tx_ring_stats(struct ice_vsi *vsi, struct ice_ring **rings, 
static void ice_update_vsi_ring_stats(struct ice_vsi *vsi)

{

	struct rtnl_link_stats64 *vsi_stats = &vsi->net_stats;

	struct ice_ring *ring;

	u64 pkts, bytes;

	int i;
@@ -5655,7 +5654,8 @@ static void ice_update_vsi_ring_stats(struct ice_vsi *vsi) 


	/* update Rx rings counters */

	ice_for_each_rxq(vsi, i) {

		ring = READ_ONCE(vsi->rx_rings[i]);

		struct ice_ring *ring = READ_ONCE(vsi->rx_rings[i]);



		ice_fetch_u64_stats_per_ring(ring, &pkts, &bytes);

		vsi_stats->rx_packets += pkts;

		vsi_stats->rx_bytes += bytes;