Re: [Intel-wired-lan] [PATCH net-next v2 4/4] net: intel: remove conditional return with no effect

On 25/07/2026 17:08, Sang-Heon Jeon wrote:
> Both branches of the check return the same value, so the check has
> no effect. Remove it and return the value directly.
> 
> This is the result of running the Coccinelle script from
> scripts/coccinelle/misc/cond_return_no_effect.cocci.
> 
> Signed-off-by: Sang-Heon Jeon <[email protected]>

Nice cleanup.

Reviewed-by: Marcin Szycik <[email protected]>

> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +-------
>  drivers/net/ethernet/intel/igb/e1000_i210.c | 6 +-----
>  drivers/net/ethernet/intel/igc/igc_phy.c    | 6 +-----
>  3 files changed, 3 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index a04683004a56..0cd0e5597c90 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -4864,16 +4864,10 @@ static void i40e_control_rx_q(struct i40e_pf *pf, int pf_q, bool enable)
>   **/
>  int i40e_control_wait_rx_q(struct i40e_pf *pf, int pf_q, bool enable)
>  {
> -	int ret = 0;
> -
>  	i40e_control_rx_q(pf, pf_q, enable);
>  
>  	/* wait for the change to finish */
> -	ret = i40e_pf_rxq_wait(pf, pf_q, enable);
> -	if (ret)
> -		return ret;
> -
> -	return ret;
> +	return i40e_pf_rxq_wait(pf, pf_q, enable);
>  }
>  
>  /**
> diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
> index 9db29b231d6a..784f9a7bcbed 100644
> --- a/drivers/net/ethernet/intel/igb/e1000_i210.c
> +++ b/drivers/net/ethernet/intel/igb/e1000_i210.c
> @@ -756,11 +756,7 @@ static s32 __igb_access_xmdio_reg(struct e1000_hw *hw, u16 address,
>  		return ret_val;
>  
>  	/* Recalibrate the device back to 0 */
> -	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, 0);
> -	if (ret_val)
> -		return ret_val;
> -
> -	return ret_val;
> +	return hw->phy.ops.write_reg(hw, E1000_MMDAC, 0);
>  }
>  
>  /**
> diff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c
> index 4cf737fb3b21..b758a7e0f013 100644
> --- a/drivers/net/ethernet/intel/igc/igc_phy.c
> +++ b/drivers/net/ethernet/intel/igc/igc_phy.c
> @@ -675,11 +675,7 @@ static s32 __igc_access_xmdio_reg(struct igc_hw *hw, u16 address,
>  		return ret_val;
>  
>  	/* Recalibrate the device back to 0 */
> -	ret_val = hw->phy.ops.write_reg(hw, IGC_MMDAC, 0);
> -	if (ret_val)
> -		return ret_val;
> -
> -	return ret_val;
> +	return hw->phy.ops.write_reg(hw, IGC_MMDAC, 0);
>  }
>  
>  /**