stmmac: dwmac-socfpga: turn setup callback into a probe function

By using a few functions from stmmac_platform a proper probe
function can be created from the setup glue callback. This
makes it look more like a standard driver and the OF match
data can also be dropped.

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-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 0df409e2edcdb7fb5a0a6d469d750b2f4d50bbdc..401383b252a8f079aba4688afd6af1a53726b962 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -232,46 +232,58 @@ static int socfpga_dwmac_init(struct platform_device *pdev, void *priv)
        return ret;
 }
 
-static void *socfpga_dwmac_probe(struct platform_device *pdev)
+static int socfpga_dwmac_probe(struct platform_device *pdev)
 {
+       struct plat_stmmacenet_data *plat_dat;
+       struct stmmac_resources stmmac_res;
        struct device           *dev = &pdev->dev;
        int                     ret;
        struct socfpga_dwmac    *dwmac;
 
+       ret = stmmac_get_platform_resources(pdev, &stmmac_res);
+       if (ret)
+               return ret;
+
+       plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);
+       if (IS_ERR(plat_dat))
+               return PTR_ERR(plat_dat);
+
        dwmac = devm_kzalloc(dev, sizeof(*dwmac), GFP_KERNEL);
        if (!dwmac)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
 
        ret = socfpga_dwmac_parse_data(dwmac, dev);
        if (ret) {
                dev_err(dev, "Unable to parse OF data\n");
-               return ERR_PTR(ret);
+               return ret;
        }
 
        ret = socfpga_dwmac_setup(dwmac);
        if (ret) {
                dev_err(dev, "couldn't setup SoC glue (%d)\n", ret);
-               return ERR_PTR(ret);
+               return ret;
        }
 
-       return dwmac;
-}
+       plat_dat->bsp_priv = dwmac;
+       plat_dat->init = socfpga_dwmac_init;
+       plat_dat->exit = socfpga_dwmac_exit;
+       plat_dat->fix_mac_speed = socfpga_dwmac_fix_mac_speed;
 
-static const struct stmmac_of_data socfpga_gmac_data = {
-       .setup = socfpga_dwmac_probe,
-       .init = socfpga_dwmac_init,
-       .exit = socfpga_dwmac_exit,
-       .fix_mac_speed = socfpga_dwmac_fix_mac_speed,
-};
+       ret = socfpga_dwmac_init(pdev, plat_dat->bsp_priv);
+       if (ret)
+               return ret;
+
+       return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+}
 
 static const struct of_device_id socfpga_dwmac_match[] = {
-       { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data },
+       { .compatible = "altr,socfpga-stmmac" },
        { }
 };
 MODULE_DEVICE_TABLE(of, socfpga_dwmac_match);
 
 static struct platform_driver socfpga_dwmac_driver = {
-       .probe  = stmmac_pltfr_probe,
+       .probe  = socfpga_dwmac_probe,
        .remove = stmmac_pltfr_remove,
        .driver = {
                .name           = "socfpga-dwmac",