proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-11 08:02:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: stmmac: dwmac-qcom-ethqos: shrink clock code with devres

Browse Source 
We can use a devm action to completely drop the remove callback and use
stmmac_pltfr_remove() directly for remove. We can also drop one of the
goto labels.

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:49 +02:00 committed by Jakub Kicinski
parent f61d2d5cf1
commit 9fc68f23a6
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,6 +586,11 @@ static int ethqos_clks_config(void *priv, bool enabled)
return ret; return ret;
} }
static void ethqos_clks_disable(void *data)
{
ethqos_clks_config(data, false);
}
static int qcom_ethqos_probe(struct platform_device *pdev) static int qcom_ethqos_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
@ -636,6 +641,10 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_mem; goto err_mem;
ret = devm_add_action_or_reset(&pdev->dev, ethqos_clks_disable, ethqos);
if (ret)
goto err_mem;
ethqos->speed = SPEED_1000; ethqos->speed = SPEED_1000;
ethqos_update_rgmii_clk(ethqos, SPEED_1000); ethqos_update_rgmii_clk(ethqos, SPEED_1000);
ethqos_set_func_clk_en(ethqos); ethqos_set_func_clk_en(ethqos);
@ -653,27 +662,16 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
if (ret) if (ret)
goto err_clk; goto err_mem;
return ret; return ret;
err_clk:
ethqos_clks_config(ethqos, false);
err_mem: err_mem:
stmmac_remove_config_dt(pdev, plat_dat); stmmac_remove_config_dt(pdev, plat_dat);
return ret; return ret;
} }
static void qcom_ethqos_remove(struct platform_device *pdev)
{
struct qcom_ethqos *ethqos = get_stmmac_bsp_priv(&pdev->dev);
stmmac_pltfr_remove(pdev);
ethqos_clks_config(ethqos, false);
}
static const struct of_device_id qcom_ethqos_match[] = { static const struct of_device_id qcom_ethqos_match[] = {
{ .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_0_data}, { .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_0_data},
{ .compatible = "qcom,sc8280xp-ethqos", .data = &emac_v3_0_0_data}, { .compatible = "qcom,sc8280xp-ethqos", .data = &emac_v3_0_0_data},
@ -684,7 +682,7 @@ MODULE_DEVICE_TABLE(of, qcom_ethqos_match);
static struct platform_driver qcom_ethqos_driver = { static struct platform_driver qcom_ethqos_driver = {
.probe = qcom_ethqos_probe, .probe = qcom_ethqos_probe,
.remove_new = qcom_ethqos_remove, .remove_new = stmmac_pltfr_remove,
.driver = { .driver = {
.name = "qcom-ethqos", .name = "qcom-ethqos",
.pm = &stmmac_pltfr_pm_ops, .pm = &stmmac_pltfr_pm_ops,