Commit 23cfbe07 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: make prep_for_reset void 



The return from i40e_prep_for_reset() was being ignored by almost all
its callers.  The one place it wasn't ignored could have caused a silent
and confusing failure of the driver to finish a reset.  Since we really
are doing a rebuild anyway, ignore this last case as well and simply
make the function a void type.

Change-ID: Ia4fed7f903d39a6c47c5722625a53e59c3f7ed53
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 17413a80

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

+5 −11
Original line number Diff line number Diff line
@@ -5611,7 +5611,7 @@ static void i40e_fdir_teardown(struct i40e_pf *pf) 
 *

 * Close up the VFs and other things in prep for pf Reset.

  **/

static int i40e_prep_for_reset(struct i40e_pf *pf)

static void i40e_prep_for_reset(struct i40e_pf *pf)

{

	struct i40e_hw *hw = &pf->hw;

	i40e_status ret = 0;
@@ -5619,7 +5619,7 @@ static int i40e_prep_for_reset(struct i40e_pf *pf) 


	clear_bit(__I40E_RESET_INTR_RECEIVED, &pf->state);

	if (test_and_set_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state))

		return 0;

		return;



	dev_dbg(&pf->pdev->dev, "Tearing down internal switch for reset\n");
@@ -5636,14 +5636,11 @@ static int i40e_prep_for_reset(struct i40e_pf *pf) 
	/* call shutdown HMC */

	if (hw->hmc.hmc_obj) {

		ret = i40e_shutdown_lan_hmc(hw);

		if (ret) {

		if (ret)

			dev_warn(&pf->pdev->dev,

				 "shutdown_lan_hmc failed: %d\n", ret);

			clear_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state);

	}

}

	return ret;

}



/**

 * i40e_send_version - update firmware with driver version
@@ -5816,10 +5813,7 @@ end_core_reset: 
 **/

static void i40e_handle_reset_warning(struct i40e_pf *pf)

{

	i40e_status ret;



	ret = i40e_prep_for_reset(pf);

	if (!ret)

	i40e_prep_for_reset(pf);

	i40e_reset_and_rebuild(pf, false);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE