stmmac: dwmac-sunxi: move sun7i_gmac_setup function

Move sun7i_gmac_setup in preparation for turning it into
a proper probe function.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
index 15048ca397591acb90f746a0e3b7bfbf5b9c9e86..c9d6e2d5bfc91ab28959659d05c26c983b523442 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
@@ -33,35 +33,6 @@ struct sunxi_priv_data {
        struct regulator *regulator;
 };
 
-static void *sun7i_gmac_setup(struct platform_device *pdev)
-{
-       struct sunxi_priv_data *gmac;
-       struct device *dev = &pdev->dev;
-
-       gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
-       if (!gmac)
-               return ERR_PTR(-ENOMEM);
-
-       gmac->interface = of_get_phy_mode(dev->of_node);
-
-       gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx");
-       if (IS_ERR(gmac->tx_clk)) {
-               dev_err(dev, "could not get tx clock\n");
-               return gmac->tx_clk;
-       }
-
-       /* Optional regulator for PHY */
-       gmac->regulator = devm_regulator_get_optional(dev, "phy");
-       if (IS_ERR(gmac->regulator)) {
-               if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER)
-                       return ERR_PTR(-EPROBE_DEFER);
-               dev_info(dev, "no regulator found\n");
-               gmac->regulator = NULL;
-       }
-
-       return gmac;
-}
-
 #define SUN7I_GMAC_GMII_RGMII_RATE     125000000
 #define SUN7I_GMAC_MII_RATE            25000000
 
@@ -132,6 +103,35 @@ static void sun7i_fix_speed(void *priv, unsigned int speed)
        }
 }
 
+static void *sun7i_gmac_setup(struct platform_device *pdev)
+{
+       struct sunxi_priv_data *gmac;
+       struct device *dev = &pdev->dev;
+
+       gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
+       if (!gmac)
+               return ERR_PTR(-ENOMEM);
+
+       gmac->interface = of_get_phy_mode(dev->of_node);
+
+       gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx");
+       if (IS_ERR(gmac->tx_clk)) {
+               dev_err(dev, "could not get tx clock\n");
+               return gmac->tx_clk;
+       }
+
+       /* Optional regulator for PHY */
+       gmac->regulator = devm_regulator_get_optional(dev, "phy");
+       if (IS_ERR(gmac->regulator)) {
+               if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER)
+                       return ERR_PTR(-EPROBE_DEFER);
+               dev_info(dev, "no regulator found\n");
+               gmac->regulator = NULL;
+       }
+
+       return gmac;
+}
+
 /* of_data specifying hardware features and callbacks.
  * hardware features were copied from Allwinner drivers. */
 static const struct stmmac_of_data sun7i_gmac_data = {