Skip to content

Commit

Permalink
mmc: sdhci-st: Obviously always return success in remove callback
Browse files Browse the repository at this point in the history
sdhci_pltfm_unregister() returns 0 unconditionally and returning an
error in a platform remove callback isn't very sensible. (The only
effect of the latter is that the device core emits a generic warning and
then removes the device anyhow.)

So return 0 unconditionally to make it obvious there is no error
forwarded to the upper layers.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20220610211257.102071-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Uwe Kleine-König authored and Ulf Hansson committed Jul 12, 2022
1 parent 869f987 commit f6c3397
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/mmc/host/sdhci-st.c
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,14 @@ static int 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;
int ret;

ret = sdhci_pltfm_unregister(pdev);
sdhci_pltfm_unregister(pdev);

clk_disable_unprepare(pdata->icnclk);

reset_control_assert(rstc);

return ret;
return 0;
}

#ifdef CONFIG_PM_SLEEP
Expand Down

0 comments on commit f6c3397

Please sign in to comment.