]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: sdhci-of-aspeed: Drop the use of sdhci_pltfm_free()
authorBinbin Zhou <zhoubinbin@loongson.cn>
Sat, 7 Jun 2025 07:38:12 +0000 (15:38 +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: Andrew Jeffery <andrew@codeconstruct.com.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: linux-aspeed@lists.ozlabs.org
Cc: openbmc@lists.ozlabs.org
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Link: https://lore.kernel.org/r/117c13ffd2d67a4c7cad980634591c4851f560b5.1749127796.git.zhoubinbin@loongson.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-of-aspeed.c

index d6de010551b9346a5672ef91bb88fad7c7d1d66b..ca97b01996b1055ee674c8727b4f5a078573d6d0 100644 (file)
@@ -425,10 +425,8 @@ static int aspeed_sdhci_probe(struct platform_device *pdev)
                return PTR_ERR(pltfm_host->clk);
 
        ret = clk_prepare_enable(pltfm_host->clk);
-       if (ret) {
-               dev_err(&pdev->dev, "Unable to enable SDIO clock\n");
-               goto err_pltfm_free;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "Unable to enable SDIO clock\n");
 
        ret = mmc_of_parse(host->mmc);
        if (ret)
@@ -445,8 +443,6 @@ static int aspeed_sdhci_probe(struct platform_device *pdev)
 
 err_sdhci_add:
        clk_disable_unprepare(pltfm_host->clk);
-err_pltfm_free:
-       sdhci_pltfm_free(pdev);
        return ret;
 }
 
@@ -461,8 +457,6 @@ static void aspeed_sdhci_remove(struct platform_device *pdev)
        sdhci_remove_host(host, 0);
 
        clk_disable_unprepare(pltfm_host->clk);
-
-       sdhci_pltfm_free(pdev);
 }
 
 static const struct aspeed_sdhci_pdata ast2400_sdhci_pdata = {