Skip to content
/ linux Public

Commit 1d4ea57

Browse files
Uwe Kleine-Königgregkh
authored andcommitted
mfd: omap-usb-host: Convert to platform remove callback returning void
[ Upstream commit 418d1e7 ] 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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20231123165627.492259-11-u.kleine-koenig@pengutronix.de Signed-off-by: Lee Jones <lee@kernel.org> Stable-dep-of: 24804ba ("mfd: omap-usb-host: Fix OF populate on driver rebind") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 59b76ae commit 1d4ea57

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/mfd/omap-usb-host.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -816,13 +816,12 @@ static int usbhs_omap_remove_child(struct device *dev, void *data)
816816
*
817817
* Reverses the effect of usbhs_omap_probe().
818818
*/
819-
static int usbhs_omap_remove(struct platform_device *pdev)
819+
static void usbhs_omap_remove(struct platform_device *pdev)
820820
{
821821
pm_runtime_disable(&pdev->dev);
822822

823823
/* remove children */
824824
device_for_each_child(&pdev->dev, NULL, usbhs_omap_remove_child);
825-
return 0;
826825
}
827826

828827
static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
@@ -845,7 +844,7 @@ static struct platform_driver usbhs_omap_driver = {
845844
.of_match_table = usbhs_omap_dt_ids,
846845
},
847846
.probe = usbhs_omap_probe,
848-
.remove = usbhs_omap_remove,
847+
.remove_new = usbhs_omap_remove,
849848
};
850849

851850
MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");

0 commit comments

Comments
 (0)