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

Acked-by: Angelo Dureghello <adureghello@baylibre.com>
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Link: https://lore.kernel.org/r/3843af6a7726d8879e5cba02e0321e08c8908328.1749127796.git.zhoubinbin@loongson.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-esdhc-mcf.c

index 327662ba5bd93037d502de8f2db3d2d4cb7c6dc6..375fce5639d715ab6bb9b9eeebb5ab31ac1cbd74 100644 (file)
@@ -426,28 +426,22 @@ static int sdhci_esdhc_mcf_probe(struct platform_device *pdev)
        host->flags |= SDHCI_AUTO_CMD12;
 
        mcf_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
-       if (IS_ERR(mcf_data->clk_ipg)) {
-               err = PTR_ERR(mcf_data->clk_ipg);
-               goto err_exit;
-       }
+       if (IS_ERR(mcf_data->clk_ipg))
+               return PTR_ERR(mcf_data->clk_ipg);
 
        mcf_data->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
-       if (IS_ERR(mcf_data->clk_ahb)) {
-               err = PTR_ERR(mcf_data->clk_ahb);
-               goto err_exit;
-       }
+       if (IS_ERR(mcf_data->clk_ahb))
+               return PTR_ERR(mcf_data->clk_ahb);
 
        mcf_data->clk_per = devm_clk_get(&pdev->dev, "per");
-       if (IS_ERR(mcf_data->clk_per)) {
-               err = PTR_ERR(mcf_data->clk_per);
-               goto err_exit;
-       }
+       if (IS_ERR(mcf_data->clk_per))
+               return PTR_ERR(mcf_data->clk_per);
 
        pltfm_host->clk = mcf_data->clk_per;
        pltfm_host->clock = clk_get_rate(pltfm_host->clk);
        err = clk_prepare_enable(mcf_data->clk_per);
        if (err)
-               goto err_exit;
+               return err;
 
        err = clk_prepare_enable(mcf_data->clk_ipg);
        if (err)
@@ -485,9 +479,6 @@ unprep_ipg:
        clk_disable_unprepare(mcf_data->clk_ipg);
 unprep_per:
        clk_disable_unprepare(mcf_data->clk_per);
-err_exit:
-       sdhci_pltfm_free(pdev);
-
        return err;
 }
 
@@ -502,8 +493,6 @@ static void sdhci_esdhc_mcf_remove(struct platform_device *pdev)
        clk_disable_unprepare(mcf_data->clk_ipg);
        clk_disable_unprepare(mcf_data->clk_ahb);
        clk_disable_unprepare(mcf_data->clk_per);
-
-       sdhci_pltfm_free(pdev);
 }
 
 static struct platform_driver sdhci_esdhc_mcf_driver = {