]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: sdhci-of-arasan: Drop the use of sdhci_pltfm_free()
authorBinbin Zhou <zhoubinbin@loongson.cn>
Sat, 7 Jun 2025 07:37:41 +0000 (15:37 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 24 Jun 2025 10:43:25 +0000 (12:43 +0200)
Since the devm_mmc_alloc_host() helper is already in use,
sdhci_pltfm_free() is no longer needed.

Cc: Michal Simek <michal.simek@amd.com>
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Link: https://lore.kernel.org/r/ff7094276568354687a691f7f2789048c1706476.1749127796.git.zhoubinbin@loongson.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-of-arasan.c

index 8c29676ab6628b00f03a9f9c3c452d609794ab3d..42878474e56e52c4b2f15741fab450f9251c8a26 100644 (file)
@@ -1883,34 +1883,26 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
                sdhci_arasan->soc_ctl_base = syscon_node_to_regmap(node);
                of_node_put(node);
 
-               if (IS_ERR(sdhci_arasan->soc_ctl_base)) {
-                       ret = dev_err_probe(dev,
+               if (IS_ERR(sdhci_arasan->soc_ctl_base))
+                       return dev_err_probe(dev,
                                            PTR_ERR(sdhci_arasan->soc_ctl_base),
                                            "Can't get syscon\n");
-                       goto err_pltfm_free;
-               }
        }
 
        sdhci_get_of_property(pdev);
 
        sdhci_arasan->clk_ahb = devm_clk_get(dev, "clk_ahb");
-       if (IS_ERR(sdhci_arasan->clk_ahb)) {
-               ret = dev_err_probe(dev, PTR_ERR(sdhci_arasan->clk_ahb),
+       if (IS_ERR(sdhci_arasan->clk_ahb))
+               return dev_err_probe(dev, PTR_ERR(sdhci_arasan->clk_ahb),
                                    "clk_ahb clock not found.\n");
-               goto err_pltfm_free;
-       }
 
        clk_xin = devm_clk_get(dev, "clk_xin");
-       if (IS_ERR(clk_xin)) {
-               ret = dev_err_probe(dev, PTR_ERR(clk_xin), "clk_xin clock not found.\n");
-               goto err_pltfm_free;
-       }
+       if (IS_ERR(clk_xin))
+               return dev_err_probe(dev, PTR_ERR(clk_xin), "clk_xin clock not found.\n");
 
        ret = clk_prepare_enable(sdhci_arasan->clk_ahb);
-       if (ret) {
-               dev_err(dev, "Unable to enable AHB clock.\n");
-               goto err_pltfm_free;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Unable to enable AHB clock.\n");
 
        /* If clock-frequency property is set, use the provided value */
        if (pltfm_host->clock &&
@@ -2029,8 +2021,6 @@ clk_disable_all:
        clk_disable_unprepare(clk_xin);
 clk_dis_ahb:
        clk_disable_unprepare(sdhci_arasan->clk_ahb);
-err_pltfm_free:
-       sdhci_pltfm_free(pdev);
        return ret;
 }