On 27/07/23 10:00, Yangtao Li wrote: > The .remove() callback for a platform driver returns an int which makes > many driver authors wrongly assume it's possible to do error handling by > returning an error code. However the value returned is (mostly) ignored > and this typically results in resource leaks. To improve here there is a > quest to make the remove callback return void. In the first step of this > quest all drivers are converted to .remove_new() which already returns > void. > > Trivially convert this driver from always returning zero in the remove > callback to the void returning variant. > > Cc: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > Signed-off-by: Yangtao Li <frank.li@xxxxxxxx> Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> > --- > drivers/mmc/host/sdhci_am654.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c > index 1cc84739ef2f..c125485ba80e 100644 > --- a/drivers/mmc/host/sdhci_am654.c > +++ b/drivers/mmc/host/sdhci_am654.c > @@ -866,7 +866,7 @@ static int sdhci_am654_probe(struct platform_device *pdev) > return ret; > } > > -static int sdhci_am654_remove(struct platform_device *pdev) > +static void sdhci_am654_remove(struct platform_device *pdev) > { > struct sdhci_host *host = platform_get_drvdata(pdev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > @@ -882,7 +882,6 @@ static int sdhci_am654_remove(struct platform_device *pdev) > pm_runtime_disable(dev); > pm_runtime_put_noidle(dev); > sdhci_pltfm_free(pdev); > - return 0; > } > > #ifdef CONFIG_PM > @@ -994,7 +993,7 @@ static struct platform_driver sdhci_am654_driver = { > .of_match_table = sdhci_am654_of_match, > }, > .probe = sdhci_am654_probe, > - .remove = sdhci_am654_remove, > + .remove_new = sdhci_am654_remove, > }; > > module_platform_driver(sdhci_am654_driver);