| Message ID | 20230326143224.572654-17-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: Convert to platform remove callback returning void | expand |
On Sun, Mar 26, 2023 at 4:32 PM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 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: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
diff --git a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c index 142d421a8d76..09409908ba5d 100644 --- a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c +++ b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c @@ -1024,7 +1024,7 @@ static int ge2d_probe(struct platform_device *pdev) return ret; } -static int ge2d_remove(struct platform_device *pdev) +static void ge2d_remove(struct platform_device *pdev) { struct meson_ge2d *ge2d = platform_get_drvdata(pdev); @@ -1032,8 +1032,6 @@ static int ge2d_remove(struct platform_device *pdev) v4l2_m2m_release(ge2d->m2m_dev); v4l2_device_unregister(&ge2d->v4l2_dev); clk_disable_unprepare(ge2d->clk); - - return 0; } static const struct of_device_id meson_ge2d_match[] = { @@ -1047,7 +1045,7 @@ MODULE_DEVICE_TABLE(of, meson_ge2d_match); static struct platform_driver ge2d_drv = { .probe = ge2d_probe, - .remove = ge2d_remove, + .remove_new = ge2d_remove, .driver = { .name = "meson-ge2d", .of_match_table = meson_ge2d_match,
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/media/platform/amlogic/meson-ge2d/ge2d.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)