mmc: davinci_mmc: Convert to platform remove callback returning void
[ Upstream commitbc1711e833] 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@pengutronix.de> Signed-off-by: Yangtao Li <frank.li@vivo.com> Link: https://lore.kernel.org/r/20230727070051.17778-7-frank.li@vivo.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Stable-dep-of:55c421b364("mmc: davinci: Don't strip remove function when driver is builtin") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
8ea8ef5e42
commit
c4f8e95a2e
@@ -1347,7 +1347,7 @@ ioremap_fail:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __exit davinci_mmcsd_remove(struct platform_device *pdev)
|
||||
static void __exit davinci_mmcsd_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct mmc_davinci_host *host = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -1356,8 +1356,6 @@ static int __exit davinci_mmcsd_remove(struct platform_device *pdev)
|
||||
davinci_release_dma_channels(host);
|
||||
clk_disable_unprepare(host->clk);
|
||||
mmc_free_host(host->mmc);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
@@ -1404,7 +1402,7 @@ static struct platform_driver davinci_mmcsd_driver = {
|
||||
.of_match_table = davinci_mmc_dt_ids,
|
||||
},
|
||||
.probe = davinci_mmcsd_probe,
|
||||
.remove = __exit_p(davinci_mmcsd_remove),
|
||||
.remove_new = __exit_p(davinci_mmcsd_remove),
|
||||
.id_table = davinci_mmc_devtype,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user