| Message ID | 20230403154014.2564054-14-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: Convert to platform remove callback returning void | expand |
Hi Uwe, Thank you for the patch. On Mon, Apr 03, 2023 at 05:40:03PM +0200, Uwe Kleine-König 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/staging/media/omap4iss/iss.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c > index fa2a36d829d3..0c4283bb48ad 100644 > --- a/drivers/staging/media/omap4iss/iss.c > +++ b/drivers/staging/media/omap4iss/iss.c > @@ -1323,15 +1323,13 @@ static int iss_probe(struct platform_device *pdev) > return ret; > } > > -static int iss_remove(struct platform_device *pdev) > +static void iss_remove(struct platform_device *pdev) > { > struct iss_device *iss = platform_get_drvdata(pdev); > > iss_unregister_entities(iss); > media_entity_enum_cleanup(&iss->crashed); > iss_cleanup_modules(iss); > - > - return 0; > } > > static const struct platform_device_id omap4iss_id_table[] = { > @@ -1342,7 +1340,7 @@ MODULE_DEVICE_TABLE(platform, omap4iss_id_table); > > static struct platform_driver iss_driver = { > .probe = iss_probe, > - .remove = iss_remove, > + .remove_new = iss_remove, > .id_table = omap4iss_id_table, > .driver = { > .name = "omap4iss",
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c index fa2a36d829d3..0c4283bb48ad 100644 --- a/drivers/staging/media/omap4iss/iss.c +++ b/drivers/staging/media/omap4iss/iss.c @@ -1323,15 +1323,13 @@ static int iss_probe(struct platform_device *pdev) return ret; } -static int iss_remove(struct platform_device *pdev) +static void iss_remove(struct platform_device *pdev) { struct iss_device *iss = platform_get_drvdata(pdev); iss_unregister_entities(iss); media_entity_enum_cleanup(&iss->crashed); iss_cleanup_modules(iss); - - return 0; } static const struct platform_device_id omap4iss_id_table[] = { @@ -1342,7 +1340,7 @@ MODULE_DEVICE_TABLE(platform, omap4iss_id_table); static struct platform_driver iss_driver = { .probe = iss_probe, - .remove = iss_remove, + .remove_new = iss_remove, .id_table = omap4iss_id_table, .driver = { .name = "omap4iss",
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. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/staging/media/omap4iss/iss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)