@@ -457,7 +457,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
/* To Configure PHY by using all device-tree supported properties */
rc = stmmac_dt_phy(plat, np, &pdev->dev);
if (rc)
- return ERR_PTR(rc);
+ goto error_dt_phy_parse;
of_property_read_u32(np, "tx-fifo-depth", &plat->tx_fifo_size);
@@ -535,8 +535,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
GFP_KERNEL);
if (!dma_cfg) {
- stmmac_remove_config_dt(pdev, plat);
- return ERR_PTR(-ENOMEM);
+ rc = -ENOMEM;
+ goto error_dma_cfg_alloc;
}
plat->dma_cfg = dma_cfg;
@@ -563,10 +563,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
plat->axi = stmmac_axi_setup(pdev);
rc = stmmac_mtl_setup(pdev, plat);
- if (rc) {
- stmmac_remove_config_dt(pdev, plat);
- return ERR_PTR(rc);
- }
+ if (rc)
+ goto error_dma_cfg_alloc;
/* clock setup */
if (!of_device_is_compatible(np, "snps,dwc-qos-ethernet-4.10")) {
@@ -581,8 +579,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
plat->pclk = devm_clk_get(&pdev->dev, "pclk");
if (IS_ERR(plat->pclk)) {
- if (PTR_ERR(plat->pclk) == -EPROBE_DEFER)
+ if (PTR_ERR(plat->pclk) == -EPROBE_DEFER) {
+ rc = PTR_ERR(plat->pclk);
goto error_pclk_get;
+ }
plat->pclk = NULL;
}
@@ -602,8 +602,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
plat->stmmac_rst = devm_reset_control_get(&pdev->dev,
STMMAC_RESOURCE_NAME);
if (IS_ERR(plat->stmmac_rst)) {
- if (PTR_ERR(plat->stmmac_rst) == -EPROBE_DEFER)
+ if (PTR_ERR(plat->stmmac_rst) == -EPROBE_DEFER) {
+ rc = PTR_ERR(plat->stmmac_rst);
goto error_hw_init;
+ }
dev_info(&pdev->dev, "no reset control found\n");
plat->stmmac_rst = NULL;
@@ -615,8 +617,12 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
clk_disable_unprepare(plat->pclk);
error_pclk_get:
clk_disable_unprepare(plat->stmmac_clk);
+error_dma_cfg_alloc:
+ of_node_put(plat->mdio_node);
+error_dt_phy_parse:
+ of_node_put(plat->phy_node);
- return ERR_PTR(-EPROBE_DEFER);
+ return ERR_PTR(rc);
}
/**
Calling an antagonistic method from the corresponding protagonist isn't good from maintainability point of view, since prevents us from directly adding a functionality in the later, which needs to be reverted in the former. Since that's what we are about to do in order to fix the commit 573c0b9c4e0 ("stmmac: move stmmac_clk, pclk, clk_ptp_ref and stmmac_rst to platform structure"), let's replace the stmmac_remove_config_dt() method invocation in stmmac_probe_config_dt() with direct reversal procedures. Fixes: f573c0b9c4e0 ("stmmac: move stmmac_clk, pclk, clk_ptp_ref and stmmac_rst to platform structure") Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- .../ethernet/stmicro/stmmac/stmmac_platform.c | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-)