net: stmmac: minor cleanups to stmmac_bus_clks_config()

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.

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

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/E1urBvf-000000002ii-37Ce@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index fa3d26c285025d01c72cef51add534fc722552b8..ebf278263d5ef04ba165ad469213b0d3b9a3b144 100644 (file)
--- 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;
+       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);