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

index 02bb871e838face4fc953d5280f9f01fe11da592..cb9152c6a65d87859ed95bc6d04d84fcb519a595 100644 (file)
@@ -310,6 +310,16 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev)
        return ret;
 }
 
+static void sdhci_bcm_kona_remove(struct platform_device *pdev)
+{
+       struct sdhci_host *host = platform_get_drvdata(pdev);
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+       struct clk *clk = pltfm_host->clk;
+
+       sdhci_pltfm_remove(pdev);
+       clk_disable_unprepare(clk);
+}
+
 static struct platform_driver sdhci_bcm_kona_driver = {
        .driver         = {
                .name   = "sdhci-kona",
@@ -318,7 +328,7 @@ static struct platform_driver sdhci_bcm_kona_driver = {
                .of_match_table = sdhci_bcm_kona_of_match,
        },
        .probe          = sdhci_bcm_kona_probe,
-       .remove_new     = sdhci_pltfm_unregister,
+       .remove_new     = sdhci_bcm_kona_remove,
 };
 module_platform_driver(sdhci_bcm_kona_driver);