From: Christophe JAILLET <christophe.jail...@wanadoo.fr>

[ Upstream commit c9c256a8b0dc09c305c409d6264cc016af2ba38d ]

'sdhci_remove_host()' and 'sdhci_pltfm_free()' should be used in place of
'mmc_remove_host()' and 'mmc_free_host()'.

This avoids some resource leaks, is more in line with the error handling
path of the probe function, and is more consistent with other drivers.

Fixes: fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host 
controller")
Signed-off-by: Christophe JAILLET <christophe.jail...@wanadoo.fr>
Acked-by: Orson Zhai <orson.z...@gmail.com>
Acked-by: Adrian Hunter <adrian.hun...@intel.com>
Link: 
https://lore.kernel.org/r/20201217204236.163446-1-christophe.jail...@wanadoo.fr
Signed-off-by: Ulf Hansson <ulf.hans...@linaro.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/mmc/host/sdhci-sprd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index f85171edabeb9..5dc36efff47ff 100644
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -708,14 +708,14 @@ static int sdhci_sprd_remove(struct platform_device *pdev)
 {
        struct sdhci_host *host = platform_get_drvdata(pdev);
        struct sdhci_sprd_host *sprd_host = TO_SPRD_HOST(host);
-       struct mmc_host *mmc = host->mmc;
 
-       mmc_remove_host(mmc);
+       sdhci_remove_host(host, 0);
+
        clk_disable_unprepare(sprd_host->clk_sdio);
        clk_disable_unprepare(sprd_host->clk_enable);
        clk_disable_unprepare(sprd_host->clk_2x_enable);
 
-       mmc_free_host(mmc);
+       sdhci_pltfm_free(pdev);
 
        return 0;
 }
-- 
2.27.0



Reply via email to