mmc: sdhci-cadence: Use sdhci_pltfm_remove()

Use sdhci_pltfm_remove() instead of sdhci_pltfm_unregister() so that
devm_clk_get_enabled() can be used for pltfm_host->clk.

This has the side effect that the order of operations on the error path
and remove path is not the same as it was before, but should be safe
nevertheless.

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-5-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
index 8cdc178ec1ba061a9dd33428667fad5933d61a13..be1505e8c536e8473511b98b9d59f3bb1f3b7c04 100644 (file)
--- a/drivers/mmc/host/sdhci-cadence.c
+++ b/drivers/mmc/host/sdhci-cadence.c
@@ -487,14 +487,10 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        static const u16 version = SDHCI_SPEC_400 << SDHCI_SPEC_VER_SHIFT;
 
-       clk = devm_clk_get(dev, NULL);
+       clk = devm_clk_get_enabled(dev, NULL);
        if (IS_ERR(clk))
                return PTR_ERR(clk);
 
-       ret = clk_prepare_enable(clk);
-       if (ret)
-               return ret;
-
        data = of_device_get_match_data(dev);
        if (!data)
                data = &sdhci_cdns_drv_data;
@@ -502,10 +498,8 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
        nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node);
        host = sdhci_pltfm_init(pdev, &data->pltfm_data,
                                struct_size(priv, phy_params, nr_phy_params));
-       if (IS_ERR(host)) {
-               ret = PTR_ERR(host);
-               goto disable_clk;
-       }
+       if (IS_ERR(host))
+               return PTR_ERR(host);
 
        pltfm_host = sdhci_priv(host);
        pltfm_host->clk = clk;
@@ -556,9 +550,6 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
        return 0;
 free:
        sdhci_pltfm_free(pdev);
-disable_clk:
-       clk_disable_unprepare(clk);
-
        return ret;
 }
 
@@ -617,7 +608,7 @@ static struct platform_driver sdhci_cdns_driver = {
                .of_match_table = sdhci_cdns_match,
        },
        .probe = sdhci_cdns_probe,
-       .remove_new = sdhci_pltfm_unregister,
+       .remove_new = sdhci_pltfm_remove,
 };
 module_platform_driver(sdhci_cdns_driver);