]> git.itanic.dy.fi Git - linux-stable/commitdiff
mmc: sdhci-st: Use sdhci_pltfm_remove()
authorAdrian Hunter <adrian.hunter@intel.com>
Fri, 11 Aug 2023 13:03:49 +0000 (16:03 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 15 Aug 2023 11:35:56 +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-15-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-st.c

index 14fc2c386bd301ae4e6291a1ad31d3af8b341619..d12532b96b51125732fe93340edc8dfc8daae2bf 100644 (file)
@@ -437,10 +437,12 @@ static void sdhci_st_remove(struct platform_device *pdev)
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
        struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
        struct reset_control *rstc = pdata->rstc;
+       struct clk *clk = pltfm_host->clk;
 
-       sdhci_pltfm_unregister(pdev);
+       sdhci_pltfm_remove(pdev);
 
        clk_disable_unprepare(pdata->icnclk);
+       clk_disable_unprepare(clk);
 
        reset_control_assert(rstc);
 }