Subject: Re: [net-next 02/14] i40e: make prep_for_reset void

From: Sergei Shtylyov <[email-masked]>
Date: Tue, 24 Jun 2014 18:03:59 +0400

Hello.

On 06/24/2014 04:47 AM, Jeff Kirsher wrote:

> From: Shannon Nelson <[email-masked]>

> 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: Shannon Nelson <[email-masked]>
> Signed-off-by: Jeff Kirsher <[email-masked]>
> ---
>   drivers/net/ethernet/intel/i40e/i40e_main.c | 17 ++++++-----------
>   1 file changed, 6 insertions(+), 11 deletions(-)

> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index b167fc2..0a68065 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
[...]
> @@ -5636,13 +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;
> +	return;

    *return* at the end of function not needed.

>   }
>   /**

WBR, Sergei