[PATCH net-next] net: stmmac: minor cleanups to stmmac_bus_clks_config()

[Jacob Keller]

On 8/27/2025 1:54 AM, Russell King (Oracle) wrote:
> stmmac_bus_clks_config() doesn't need to repeatedly on dereference
> priv->plat as this remains the same throughout this function. Not only
> does this detract from the function's readability, but it could cause
> the value to be reloaded each time. Use a local variable.
> 

Even if the compiler figures out its safe to store the access and reuse
it, its much more readable to use the local variable.

> Also, the final return can simply return zero, and we can dispense
> with the initialiser for 'ret'.

Also good cleanup.

> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel at armlinux.org.uk>
> ---

Reviewed-by: Jacob Keller <jacob.e.keller at intel.com>

>  .../net/ethernet/stmicro/stmmac/stmmac_main.c | 27 ++++++++++---------
>  1 file changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 429a871d7378..88f5d637f033 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -149,33 +149,34 @@ static void stmmac_exit_fs(struct net_device *dev);
>  
>  int stmmac_bus_clks_config(struct stmmac_priv *priv, bool enabled)
>  {
> -	int ret = 0;
> +	struct plat_stmmacenet_data *plat_dat = priv->plat;

I did notice the driver was inconsistent in whether it refers to this as
*plat or *plat_dat... Its slightly shorter to use *plat, but I do think
*plat_dat is a bit nicer to read.

Reviewed-by: Jacob Keller <jacob.e.keller at intel.com>

> +	int ret;
>  
>  	if (enabled) {
> -		ret = clk_prepare_enable(priv->plat->stmmac_clk);
> +		ret = clk_prepare_enable(plat_dat->stmmac_clk);
>  		if (ret)
>  			return ret;
> -		ret = clk_prepare_enable(priv->plat->pclk);
> +		ret = clk_prepare_enable(plat_dat->pclk);
>  		if (ret) {
> -			clk_disable_unprepare(priv->plat->stmmac_clk);
> +			clk_disable_unprepare(plat_dat->stmmac_clk);
>  			return ret;
>  		}
> -		if (priv->plat->clks_config) {
> -			ret = priv->plat->clks_config(priv->plat->bsp_priv, enabled);
> +		if (plat_dat->clks_config) {
> +			ret = plat_dat->clks_config(plat_dat->bsp_priv, enabled);
>  			if (ret) {
> -				clk_disable_unprepare(priv->plat->stmmac_clk);
> -				clk_disable_unprepare(priv->plat->pclk);
> +				clk_disable_unprepare(plat_dat->stmmac_clk);
> +				clk_disable_unprepare(plat_dat->pclk);
>  				return ret;
>  			}
>  		}
>  	} else {
> -		clk_disable_unprepare(priv->plat->stmmac_clk);
> -		clk_disable_unprepare(priv->plat->pclk);
> -		if (priv->plat->clks_config)
> -			priv->plat->clks_config(priv->plat->bsp_priv, enabled);
> +		clk_disable_unprepare(plat_dat->stmmac_clk);
> +		clk_disable_unprepare(plat_dat->pclk);
> +		if (plat_dat->clks_config)
> +			plat_dat->clks_config(plat_dat->bsp_priv, enabled);
>  	}
>  
> -	return ret;
> +	return 0;
>  }
>  EXPORT_SYMBOL_GPL(stmmac_bus_clks_config);
>  

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 236 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20250827/1b7a161e/attachment.sig>