net: stmmac: dwmac-rk: use devm_stmmac_probe_config_dt()

Simplify the driver's probe() function by using the devres
variant of stmmac_probe_config_dt().

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index d920a50dd16c7ce39b5e26a7b016ce2ceded95fd..382e8de1255da75af614d8489b2e56613ba7dd8a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1824,7 +1824,7 @@ static int rk_gmac_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
+       plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);
        if (IS_ERR(plat_dat))
                return PTR_ERR(plat_dat);
 
@@ -1836,18 +1836,16 @@ static int rk_gmac_probe(struct platform_device *pdev)
        plat_dat->fix_mac_speed = rk_fix_speed;
 
        plat_dat->bsp_priv = rk_gmac_setup(pdev, plat_dat, data);
-       if (IS_ERR(plat_dat->bsp_priv)) {
-               ret = PTR_ERR(plat_dat->bsp_priv);
-               goto err_remove_config_dt;
-       }
+       if (IS_ERR(plat_dat->bsp_priv))
+               return PTR_ERR(plat_dat->bsp_priv);
 
        ret = rk_gmac_clk_init(plat_dat);
        if (ret)
-               goto err_remove_config_dt;
+               return ret;
 
        ret = rk_gmac_powerup(plat_dat->bsp_priv);
        if (ret)
-               goto err_remove_config_dt;
+               return ret;
 
        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
        if (ret)
@@ -1857,8 +1855,6 @@ static int rk_gmac_probe(struct platform_device *pdev)
 
 err_gmac_powerdown:
        rk_gmac_powerdown(plat_dat->bsp_priv);
-err_remove_config_dt:
-       stmmac_remove_config_dt(pdev, plat_dat);
 
        return ret;
 }