net: stmmac: ingenic: move ingenic_mac_init()

Move ingenic_mac_init() to between variant specific set_mode()
implementations and ingenic_mac_probe(). No code changes.

Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vHHpi-0000000Djqp-4910@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
index c1670f6bae145d3cf71a19bd2645fd300513f1a1..8d0627055799b1cd07546cf115afa58ed684a578 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
@@ -71,20 +71,6 @@ struct ingenic_soc_info {
        int (*set_mode)(struct plat_stmmacenet_data *plat_dat);
 };
 
-static int ingenic_mac_init(struct platform_device *pdev, void *bsp_priv)
-{
-       struct ingenic_mac *mac = bsp_priv;
-       int ret;
-
-       if (mac->soc_info->set_mode) {
-               ret = mac->soc_info->set_mode(mac->plat_dat);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-
 static int jz4775_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
 {
        struct ingenic_mac *mac = plat_dat->bsp_priv;
@@ -234,6 +220,20 @@ static int x2000_mac_set_mode(struct plat_stmmacenet_data *plat_dat)
        return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, val);
 }
 
+static int ingenic_mac_init(struct platform_device *pdev, void *bsp_priv)
+{
+       struct ingenic_mac *mac = bsp_priv;
+       int ret;
+
+       if (mac->soc_info->set_mode) {
+               ret = mac->soc_info->set_mode(mac->plat_dat);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
 static int ingenic_mac_probe(struct platform_device *pdev)
 {
        struct plat_stmmacenet_data *plat_dat;