[PATCH net-next 2/5] net: stmmac: place .mac_finish() method more appropriately

[Maxime Chevallier]

On 15/10/2025 18:10, Russell King (Oracle) wrote:
> Place the .mac_finish() initialiser and implementation after the
> .mac_config() initialiser and method which reflects the order that
> they appear in struct phylink_mac_ops, and the order in which they
> are called. This keeps logically similar code together.
> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel at armlinux.org.uk>

Reviewed-by: Maxime Chevallier <maxime.chevallier at bootlin.com>

> ---
>  .../net/ethernet/stmicro/stmmac/stmmac_main.c | 26 +++++++++----------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 650d75b73e0b..3728afa701c6 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -859,6 +859,18 @@ static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,
>  	/* Nothing to do, xpcs_config() handles everything */
>  }
>  
> +static int stmmac_mac_finish(struct phylink_config *config, unsigned int mode,
> +			     phy_interface_t interface)
> +{
> +	struct net_device *ndev = to_net_dev(config->dev);
> +	struct stmmac_priv *priv = netdev_priv(ndev);
> +
> +	if (priv->plat->mac_finish)
> +		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode, interface);
> +
> +	return 0;
> +}
> +
>  static void stmmac_mac_link_down(struct phylink_config *config,
>  				 unsigned int mode, phy_interface_t interface)
>  {
> @@ -1053,27 +1065,15 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
>  	return 0;
>  }
>  
> -static int stmmac_mac_finish(struct phylink_config *config, unsigned int mode,
> -			     phy_interface_t interface)
> -{
> -	struct net_device *ndev = to_net_dev(config->dev);
> -	struct stmmac_priv *priv = netdev_priv(ndev);
> -
> -	if (priv->plat->mac_finish)
> -		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode, interface);
> -
> -	return 0;
> -}
> -
>  static const struct phylink_mac_ops stmmac_phylink_mac_ops = {
>  	.mac_get_caps = stmmac_mac_get_caps,
>  	.mac_select_pcs = stmmac_mac_select_pcs,
>  	.mac_config = stmmac_mac_config,
> +	.mac_finish = stmmac_mac_finish,
>  	.mac_link_down = stmmac_mac_link_down,
>  	.mac_link_up = stmmac_mac_link_up,
>  	.mac_disable_tx_lpi = stmmac_mac_disable_tx_lpi,
>  	.mac_enable_tx_lpi = stmmac_mac_enable_tx_lpi,
> -	.mac_finish = stmmac_mac_finish,
>  };
>  
>  /**