mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
mmc: sdhci-iproc: 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-8-adrian.hunter@intel.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
080b5adf98
commit
3f3771341e
1 changed files with 3 additions and 11 deletions
|
@ -386,16 +386,11 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
|
|||
host->mmc->caps |= iproc_host->data->mmc_caps;
|
||||
|
||||
if (dev->of_node) {
|
||||
pltfm_host->clk = devm_clk_get(dev, NULL);
|
||||
pltfm_host->clk = devm_clk_get_enabled(dev, NULL);
|
||||
if (IS_ERR(pltfm_host->clk)) {
|
||||
ret = PTR_ERR(pltfm_host->clk);
|
||||
goto err;
|
||||
}
|
||||
ret = clk_prepare_enable(pltfm_host->clk);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to enable host clk\n");
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
if (iproc_host->data->missing_caps) {
|
||||
|
@ -406,13 +401,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
|
|||
|
||||
ret = sdhci_add_host(host);
|
||||
if (ret)
|
||||
goto err_clk;
|
||||
goto err;
|
||||
|
||||
return 0;
|
||||
|
||||
err_clk:
|
||||
if (dev->of_node)
|
||||
clk_disable_unprepare(pltfm_host->clk);
|
||||
err:
|
||||
sdhci_pltfm_free(pdev);
|
||||
return ret;
|
||||
|
@ -432,7 +424,7 @@ static struct platform_driver sdhci_iproc_driver = {
|
|||
.pm = &sdhci_pltfm_pmops,
|
||||
},
|
||||
.probe = sdhci_iproc_probe,
|
||||
.remove_new = sdhci_pltfm_unregister,
|
||||
.remove_new = sdhci_pltfm_remove,
|
||||
.shutdown = sdhci_iproc_shutdown,
|
||||
};
|
||||
module_platform_driver(sdhci_iproc_driver);
|
||||
|
|
Loading…
Reference in a new issue