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

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>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index c801838fae2a4fda8a0d679e69322f01ca5855a8..2da0738eed2452f2de48b0795ee16ff8a469a4cf 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -586,6 +586,11 @@ static int ethqos_clks_config(void *priv, bool enabled)
        return ret;
 }
 
+static void ethqos_clks_disable(void *data)
+{
+       ethqos_clks_config(data, false);
+}
+
 static int qcom_ethqos_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
@@ -636,6 +641,10 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
        if (ret)
                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_update_rgmii_clk(ethqos, SPEED_1000);
        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);
        if (ret)
-               goto err_clk;
+               goto err_mem;
 
        return ret;
 
-err_clk:
-       ethqos_clks_config(ethqos, false);
-
 err_mem:
        stmmac_remove_config_dt(pdev, plat_dat);
 
        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[] = {
        { .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_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 = {
        .probe  = qcom_ethqos_probe,
-       .remove_new = qcom_ethqos_remove,
+       .remove_new = stmmac_pltfr_remove,
        .driver = {
                .name           = "qcom-ethqos",
                .pm             = &stmmac_pltfr_pm_ops,