Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af26ce2d authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e: remove extraneous loop in i40e_vsi_wait_queues_disabled 



We can simply check both Tx and Rx queues in a single loop, rather than
repeating the loop twice.

Change-ID: Ic06f26b0e3c2620e0e33c1a2999edda488e647ad
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 41c4c2b5

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −7
Original line number Diff line number Diff line
@@ -4440,7 +4440,7 @@ static void i40e_pf_unquiesce_all_vsi(struct i40e_pf *pf) 
 * i40e_vsi_wait_queues_disabled - Wait for VSI's queues to be disabled

 * @vsi: the VSI being configured

 *

 * This function waits for the given VSI's queues to be disabled.

 * Wait until all queues on a given VSI have been disabled.

 **/

static int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi)

{
@@ -4449,7 +4449,7 @@ static int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi) 


	pf_q = vsi->base_queue;

	for (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) {

		/* Check and wait for the disable status of the queue */

		/* Check and wait for the Tx queue */

		ret = i40e_pf_txq_wait(pf, pf_q, false);

		if (ret) {

			dev_info(&pf->pdev->dev,
@@ -4457,11 +4457,7 @@ static int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi) 
				 vsi->seid, pf_q);

			return ret;

		}

	}



	pf_q = vsi->base_queue;

	for (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) {

		/* Check and wait for the disable status of the queue */

		/* Check and wait for the Tx queue */

		ret = i40e_pf_rxq_wait(pf, pf_q, false);

		if (ret) {

			dev_info(&pf->pdev->dev,