]> git.itanic.dy.fi Git - linux-stable/commitdiff
mmc: sdhci-of-arasan: Use sdhci_pltfm_remove()
authorAdrian Hunter <adrian.hunter@intel.com>
Fri, 11 Aug 2023 13:03:43 +0000 (16:03 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 15 Aug 2023 11:35:35 +0000 (13:35 +0200)
Use sdhci_pltfm_remove() instead of sdhci_pltfm_unregister() because
sdhci_pltfm_unregister() is going to be removed.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230811130351.7038-9-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-of-arasan.c

index 15025af326a2714ef187e4c245256db5a97b480b..5edd024347bd5d48f1ecd919e46ba5a2df1dbfa0 100644 (file)
@@ -2022,6 +2022,7 @@ static void sdhci_arasan_remove(struct platform_device *pdev)
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
        struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
        struct clk *clk_ahb = sdhci_arasan->clk_ahb;
+       struct clk *clk_xin = pltfm_host->clk;
 
        if (!IS_ERR(sdhci_arasan->phy)) {
                if (sdhci_arasan->is_phy_on)
@@ -2031,8 +2032,9 @@ static void sdhci_arasan_remove(struct platform_device *pdev)
 
        sdhci_arasan_unregister_sdclk(&pdev->dev);
 
-       sdhci_pltfm_unregister(pdev);
+       sdhci_pltfm_remove(pdev);
 
+       clk_disable_unprepare(clk_xin);
        clk_disable_unprepare(clk_ahb);
 }