[PATCH net-next] net: stmmac: move stmmac_mac_finish() after stmmac_mac_config()

[PATCH net-next] net: stmmac: move stmmac_mac_finish() after stmmac_mac_config()

[Russell King (Oracle)]

Keep the functions and initialisers in the same order that they exist
in phylink_mac_ops. This is the preferred order for phylink methods
as it arranges the configuration methods by called order.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 970c670fc302..d16e522c1e7d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -932,7 +932,8 @@ static int stmmac_mac_finish(struct phylink_config *config, unsigned int mode,
 	struct stmmac_priv *priv = netdev_priv(ndev);
 
 	if (priv->plat->mac_finish)
-		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode, interface);
+		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode,
+				       interface);
 
 	return 0;
 }
-- 
2.47.3

Re: [PATCH net-next] net: stmmac: move stmmac_mac_finish() after stmmac_mac_config()

[Maxime Chevallier]

Hi Russell,

On 21/11/2025 10:52, Russell King (Oracle) wrote:
> Keep the functions and initialisers in the same order that they exist
> in phylink_mac_ops. This is the preferred order for phylink methods
> as it arranges the configuration methods by called order.
> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 970c670fc302..d16e522c1e7d 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -932,7 +932,8 @@ static int stmmac_mac_finish(struct phylink_config *config, unsigned int mode,
>  	struct stmmac_priv *priv = netdev_priv(ndev);
>  
>  	if (priv->plat->mac_finish)
> -		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode, interface);
> +		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode,
> +				       interface);

This is just a line wrap, I don't really see the connexion with the
commit log :( Some missing hunks in the commit maybe ?

Maxime

>  
>  	return 0;
>  }

Re: [PATCH net-next] net: stmmac: move stmmac_mac_finish() after stmmac_mac_config()

[Russell King (Oracle)]

On Fri, Nov 21, 2025 at 01:03:59PM +0100, Maxime Chevallier wrote:
> Hi Russell,
> 
> On 21/11/2025 10:52, Russell King (Oracle) wrote:
> > Keep the functions and initialisers in the same order that they exist
> > in phylink_mac_ops. This is the preferred order for phylink methods
> > as it arranges the configuration methods by called order.
> > 
> > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> > ---
> >  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > index 970c670fc302..d16e522c1e7d 100644
> > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > @@ -932,7 +932,8 @@ static int stmmac_mac_finish(struct phylink_config *config, unsigned int mode,
> >  	struct stmmac_priv *priv = netdev_priv(ndev);
> >  
> >  	if (priv->plat->mac_finish)
> > -		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode, interface);
> > +		priv->plat->mac_finish(ndev, priv->plat->bsp_priv, mode,
> > +				       interface);
> 
> This is just a line wrap, I don't really see the connexion with the
> commit log :( Some missing hunks in the commit maybe ?

Oh, I thought I hadn't sent the patch, but I had... meanwhile I'd
updated my local copy to fix the line wrap, forgotten I'd done that,
rebased the patch and ended up with a patch with that description
but with only the reformatting. Bah. I'll move it out of patchwork.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!