mmc: sdhci-sprd: Drop the use of sdhci_pltfm_free()

Since the devm_mmc_alloc_host() helper is already in use,
sdhci_pltfm_free() is no longer needed.

Cc: Orson Zhai <orsonzhai@gmail.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Link: https://lore.kernel.org/r/88a24d5f60bc916712cca813e24ae49b7e691eb2.1749127796.git.zhoubinbin@loongson.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index db5e253b0f79187ad017fcdb999da57a3de3dea0..a5dec1a0e934ee8e54a77336b2e5e0a62cd6f772 100644 (file)
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -764,7 +764,7 @@ static int sdhci_sprd_probe(struct platform_device *pdev)
 
        ret = mmc_of_parse(host->mmc);
        if (ret)
-               goto pltfm_free;
+               return ret;
 
        if (!mmc_card_is_removable(host->mmc))
                host->mmc_host_ops.request_atomic = sdhci_sprd_request_atomic;
@@ -778,34 +778,26 @@ static int sdhci_sprd_probe(struct platform_device *pdev)
        if (!IS_ERR(sprd_host->pinctrl)) {
                sprd_host->pins_uhs =
                        pinctrl_lookup_state(sprd_host->pinctrl, "state_uhs");
-               if (IS_ERR(sprd_host->pins_uhs)) {
-                       ret = PTR_ERR(sprd_host->pins_uhs);
-                       goto pltfm_free;
-               }
+               if (IS_ERR(sprd_host->pins_uhs))
+                       return PTR_ERR(sprd_host->pins_uhs);
 
                sprd_host->pins_default =
                        pinctrl_lookup_state(sprd_host->pinctrl, "default");
-               if (IS_ERR(sprd_host->pins_default)) {
-                       ret = PTR_ERR(sprd_host->pins_default);
-                       goto pltfm_free;
-               }
+               if (IS_ERR(sprd_host->pins_default))
+                       return PTR_ERR(sprd_host->pins_default);
        }
 
        clk = devm_clk_get(&pdev->dev, "sdio");
-       if (IS_ERR(clk)) {
-               ret = PTR_ERR(clk);
-               goto pltfm_free;
-       }
+       if (IS_ERR(clk))
+               return PTR_ERR(clk);
        sprd_host->clk_sdio = clk;
        sprd_host->base_rate = clk_get_rate(sprd_host->clk_sdio);
        if (!sprd_host->base_rate)
                sprd_host->base_rate = SDHCI_SPRD_CLK_DEF_RATE;
 
        clk = devm_clk_get(&pdev->dev, "enable");
-       if (IS_ERR(clk)) {
-               ret = PTR_ERR(clk);
-               goto pltfm_free;
-       }
+       if (IS_ERR(clk))
+               return PTR_ERR(clk);
        sprd_host->clk_enable = clk;
 
        clk = devm_clk_get(&pdev->dev, "2x_enable");
@@ -814,7 +806,7 @@ static int sdhci_sprd_probe(struct platform_device *pdev)
 
        ret = clk_prepare_enable(sprd_host->clk_sdio);
        if (ret)
-               goto pltfm_free;
+               return ret;
 
        ret = clk_prepare_enable(sprd_host->clk_enable);
        if (ret)
@@ -891,9 +883,6 @@ clk_disable2:
 
 clk_disable:
        clk_disable_unprepare(sprd_host->clk_sdio);
-
-pltfm_free:
-       sdhci_pltfm_free(pdev);
        return ret;
 }
 
@@ -907,8 +896,6 @@ static void sdhci_sprd_remove(struct platform_device *pdev)
        clk_disable_unprepare(sprd_host->clk_sdio);
        clk_disable_unprepare(sprd_host->clk_enable);
        clk_disable_unprepare(sprd_host->clk_2x_enable);
-
-       sdhci_pltfm_free(pdev);
 }
 
 static const struct of_device_id sdhci_sprd_of_match[] = {