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

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

The remove_new() callback now needs to be switched to
stmmac_pltfr_remove_no_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-ingenic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
index 0a20c3d24722ce2f62110c96870d8248ceae8315..3f87053ffc07e7b90ff2f1c5bcc9baedee490987 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
@@ -241,29 +241,25 @@ static int ingenic_mac_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);
 
        mac = devm_kzalloc(&pdev->dev, sizeof(*mac), GFP_KERNEL);
-       if (!mac) {
-               ret = -ENOMEM;
-               goto err_remove_config_dt;
-       }
+       if (!mac)
+               return -ENOMEM;
 
        data = of_device_get_match_data(&pdev->dev);
        if (!data) {
                dev_err(&pdev->dev, "No of match data provided\n");
-               ret = -EINVAL;
-               goto err_remove_config_dt;
+               return -EINVAL;
        }
 
        /* Get MAC PHY control register */
        mac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "mode-reg");
        if (IS_ERR(mac->regmap)) {
                dev_err(&pdev->dev, "%s: Failed to get syscon regmap\n", __func__);
-               ret = PTR_ERR(mac->regmap);
-               goto err_remove_config_dt;
+               return PTR_ERR(mac->regmap);
        }
 
        if (!of_property_read_u32(pdev->dev.of_node, "tx-clk-delay-ps", &tx_delay_ps)) {
@@ -272,8 +268,7 @@ static int ingenic_mac_probe(struct platform_device *pdev)
                        mac->tx_delay = tx_delay_ps * 1000;
                } else {
                        dev_err(&pdev->dev, "Invalid TX clock delay: %dps\n", tx_delay_ps);
-                       ret = -EINVAL;
-                       goto err_remove_config_dt;
+                       return -EINVAL;
                }
        }
 
@@ -283,8 +278,7 @@ static int ingenic_mac_probe(struct platform_device *pdev)
                        mac->rx_delay = rx_delay_ps * 1000;
                } else {
                        dev_err(&pdev->dev, "Invalid RX clock delay: %dps\n", rx_delay_ps);
-                       ret = -EINVAL;
-                       goto err_remove_config_dt;
+                       return -EINVAL;
                }
        }
 
@@ -295,18 +289,9 @@ static int ingenic_mac_probe(struct platform_device *pdev)
 
        ret = ingenic_mac_init(plat_dat);
        if (ret)
-               goto err_remove_config_dt;
-
-       ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
-       if (ret)
-               goto err_remove_config_dt;
-
-       return 0;
-
-err_remove_config_dt:
-       stmmac_remove_config_dt(pdev, plat_dat);
+               return ret;
 
-       return ret;
+       return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -385,7 +370,7 @@ MODULE_DEVICE_TABLE(of, ingenic_mac_of_matches);
 
 static struct platform_driver ingenic_mac_driver = {
        .probe          = ingenic_mac_probe,
-       .remove_new     = stmmac_pltfr_remove,
+       .remove_new     = stmmac_pltfr_remove_no_dt,
        .driver         = {
                .name   = "ingenic-mac",
                .pm             = pm_ptr(&ingenic_mac_pm_ops),