Commit 0c2561c8 authored by Brett Creeley's avatar Brett Creeley Committed by Jeff Kirsher
Browse files

ice: Use ice_for_each_q_vector macro where possible 



There are many places in the code where we do the following:

for (i = 0; i < vsi->num_q_vectors; i++)

Instead use the macro mentioned in the commit title:

ice_for_each_q_vector(vsi, i)

Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a92e1bb6

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

+3 −3
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ void ice_vsi_free_q_vectors(struct ice_vsi *vsi) 
{

	int v_idx;



	for (v_idx = 0; v_idx < vsi->num_q_vectors; v_idx++)

	ice_for_each_q_vector(vsi, v_idx)

		ice_free_q_vector(vsi, v_idx);

}
@@ -2409,7 +2409,7 @@ void ice_vsi_free_irq(struct ice_vsi *vsi) 
			return;



		vsi->irqs_ready = false;

		for (i = 0; i < vsi->num_q_vectors; i++) {

		ice_for_each_q_vector(vsi, i) {

			u16 vector = i + base;

			int irq_num;
@@ -2633,7 +2633,7 @@ void ice_vsi_dis_irq(struct ice_vsi *vsi) 
			wr32(hw, GLINT_DYN_CTL(i), 0);



		ice_flush(hw);

		for (i = 0; i < vsi->num_q_vectors; i++)

		ice_for_each_q_vector(vsi, i)

			synchronize_irq(pf->msix_entries[i + base].vector);

	}

}

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

+5 −5
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ static int ice_vsi_ena_irq(struct ice_vsi *vsi) 
	if (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) {

		int i;



		for (i = 0; i < vsi->num_q_vectors; i++)

		ice_for_each_q_vector(vsi, i)

			ice_irq_dynamic_ena(hw, vsi, vsi->q_vectors[i]);

	}
@@ -1705,7 +1705,7 @@ void ice_napi_del(struct ice_vsi *vsi) 
	if (!vsi->netdev)

		return;



	for (v_idx = 0; v_idx < vsi->num_q_vectors; v_idx++)

	ice_for_each_q_vector(vsi, v_idx)

		netif_napi_del(&vsi->q_vectors[v_idx]->napi);

}
@@ -1724,7 +1724,7 @@ static void ice_napi_add(struct ice_vsi *vsi) 
	if (!vsi->netdev)

		return;



	for (v_idx = 0; v_idx < vsi->num_q_vectors; v_idx++)

	ice_for_each_q_vector(vsi, v_idx)

		netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,

			       ice_napi_poll, NAPI_POLL_WEIGHT);

}
@@ -2960,7 +2960,7 @@ static void ice_napi_enable_all(struct ice_vsi *vsi) 
	if (!vsi->netdev)

		return;



	for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) {

	ice_for_each_q_vector(vsi, q_idx)  {

		struct ice_q_vector *q_vector = vsi->q_vectors[q_idx];



		if (q_vector->rx.ring || q_vector->tx.ring)
@@ -3334,7 +3334,7 @@ static void ice_napi_disable_all(struct ice_vsi *vsi) 
	if (!vsi->netdev)

		return;



	for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) {

	ice_for_each_q_vector(vsi, q_idx) {

		struct ice_q_vector *q_vector = vsi->q_vectors[q_idx];



		if (q_vector->rx.ring || q_vector->tx.ring)