net: stmmac: dwmac-generic: use stmmac_pltfr_probe()

Shrink the code and remove labels by using the new stmmac_pltfr_probe()
function.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/r/20230623100417.93592-7-brgl@bgdev.pl
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
index dabf056..20fc455 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
@@ -46,19 +46,12 @@ static int dwmac_generic_probe(struct platform_device *pdev)
                plat_dat->unicast_filter_entries = 1;
        }
 
-       /* Custom initialisation (if needed) */
-       ret = stmmac_pltfr_init(pdev, plat_dat);
+       ret = stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);
        if (ret)
                goto err_remove_config_dt;
 
-       ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
-       if (ret)
-               goto err_exit;
-
        return 0;
 
-err_exit:
-       stmmac_pltfr_exit(pdev, plat_dat);
 err_remove_config_dt:
        if (pdev->dev.of_node)
                stmmac_remove_config_dt(pdev, plat_dat);