Skip to content

Commit

Permalink
media: rcar_fdp1: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
[ Upstream commit 0e82d37 ]

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: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Stable-dep-of: c766c90 ("media: rcar_fdp1: Fix refcount leak in probe and remove function")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and gregkh committed May 11, 2023
1 parent b54f742 commit e05b56a
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/media/platform/renesas/rcar_fdp1.c
Original file line number Diff line number Diff line change
Expand Up @@ -2396,16 +2396,14 @@ static int fdp1_probe(struct platform_device *pdev)
return ret;
}

static int fdp1_remove(struct platform_device *pdev)
static void fdp1_remove(struct platform_device *pdev)
{
struct fdp1_dev *fdp1 = platform_get_drvdata(pdev);

v4l2_m2m_release(fdp1->m2m_dev);
video_unregister_device(&fdp1->vfd);
v4l2_device_unregister(&fdp1->v4l2_dev);
pm_runtime_disable(&pdev->dev);

return 0;
}

static int __maybe_unused fdp1_pm_runtime_suspend(struct device *dev)
Expand Down Expand Up @@ -2441,7 +2439,7 @@ MODULE_DEVICE_TABLE(of, fdp1_dt_ids);

static struct platform_driver fdp1_pdrv = {
.probe = fdp1_probe,
.remove = fdp1_remove,
.remove_new = fdp1_remove,
.driver = {
.name = DRIVER_NAME,
.of_match_table = fdp1_dt_ids,
Expand Down

0 comments on commit e05b56a

Please sign in to comment.