iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: stmmac: dwmac-qcom-ethqos: rename a label in probe()

Browse Source 
The err_mem label's name is unclear. It actually should be reached on
any error after stmmac_probe_config_dt() succeeds. Name it after the
cleanup action that needs to be called before exiting.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Bartosz Golaszewski 2023-06-19 11:23:50 +02:00 committed by Jakub Kicinski
parent 9fc68f23a6
commit 9bc5806091
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
View File

@ -615,14 +615,14 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
ethqos = devm_kzalloc(&pdev->dev, sizeof(*ethqos), GFP_KERNEL);
if (!ethqos) {
ret = -ENOMEM;
goto err_mem;
goto out_config_dt;
}
ethqos->pdev = pdev;
ethqos->rgmii_base = devm_platform_ioremap_resource_byname(pdev, "rgmii");
if (IS_ERR(ethqos->rgmii_base)) {
ret = PTR_ERR(ethqos->rgmii_base);
goto err_mem;
goto out_config_dt;
}
data = of_device_get_match_data(&pdev->dev);
@ -634,16 +634,16 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii");
if (IS_ERR(ethqos->rgmii_clk)) {
ret = PTR_ERR(ethqos->rgmii_clk);
goto err_mem;
goto out_config_dt;
}
ret = ethqos_clks_config(ethqos, true);
if (ret)
goto err_mem;
goto out_config_dt;
ret = devm_add_action_or_reset(&pdev->dev, ethqos_clks_disable, ethqos);
if (ret)
goto err_mem;
goto out_config_dt;
ethqos->speed = SPEED_1000;
ethqos_update_rgmii_clk(ethqos, SPEED_1000);
@ -662,11 +662,11 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
if (ret)
goto err_mem;
goto out_config_dt;
return ret;
err_mem:
out_config_dt:
stmmac_remove_config_dt(pdev, plat_dat);
return ret;