Commit 854034e2 authored by Yangtao Li's avatar Yangtao Li Committed by Ulf Hansson
Browse files

mmc: sdhci_am654: Properly handle failures in .remove() 



Returning an error code in a platform driver's remove function is wrong
most of the time and there is an effort to make the callback return
void. To prepare this rework the function not to exit early.

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20230727070051.17778-59-frank.li@vivo.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8d777034

drivers/mmc/host/sdhci_am654.c

+5 −4
Original line number Diff line number Diff line
@@ -870,16 +870,17 @@ static int sdhci_am654_remove(struct platform_device *pdev) 
{

	struct sdhci_host *host = platform_get_drvdata(pdev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct device *dev = &pdev->dev;

	int ret;



	ret = pm_runtime_resume_and_get(&pdev->dev);

	ret = pm_runtime_get_sync(dev);

	if (ret < 0)

		return ret;

		dev_err(dev, "pm_runtime_get_sync() Failed\n");



	sdhci_remove_host(host, true);

	clk_disable_unprepare(pltfm_host->clk);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_disable(dev);

	pm_runtime_put_noidle(dev);

	sdhci_pltfm_free(pdev);

	return 0;

}