Subject: Re: [PATCH net-next 03/13] net: stmmac: reduce indentation when calling stmmac_xpcs_setup

From: Wong Vee Khee <[email-masked]>
Date: Thu, 10 Jun 2021 07:15:18 +0800

On Wed, Jun 09, 2021 at 09:41:45PM +0300, Vladimir Oltean wrote:
> From: Vladimir Oltean <[email-masked]>
> 
> There is no reason to embed an if within an if, we can just logically
> AND the two conditions.
> 
> Signed-off-by: Vladimir Oltean <[email-masked]>

Reviewed-by: Wong Vee Khee <[email-masked]>

> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 1c881ec8cd04..372673f9af30 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -7002,12 +7002,10 @@ int stmmac_dvr_probe(struct device *device,
>  	if (priv->plat->speed_mode_2500)
>  		priv->plat->speed_mode_2500(ndev, priv->plat->bsp_priv);
>  
> -	if (priv->plat->mdio_bus_data) {
> -		if (priv->plat->mdio_bus_data->has_xpcs) {
> -			ret = stmmac_xpcs_setup(priv->mii);
> -			if (ret)
> -				goto error_xpcs_setup;
> -		}
> +	if (priv->plat->mdio_bus_data && priv->plat->mdio_bus_data->has_xpcs) {
> +		ret = stmmac_xpcs_setup(priv->mii);
> +		if (ret)
> +			goto error_xpcs_setup;
>  	}
>  
>  	ret = stmmac_phy_setup(priv);
> -- 
> 2.25.1
>