Commit 7505faa0 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Hans Verkuil

media: imx-pxp: Convert to platform remove callback returning void

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 9457f2d9
...@@ -1904,7 +1904,7 @@ static int pxp_probe(struct platform_device *pdev) ...@@ -1904,7 +1904,7 @@ static int pxp_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int pxp_remove(struct platform_device *pdev) static void pxp_remove(struct platform_device *pdev)
{ {
struct pxp_dev *dev = platform_get_drvdata(pdev); struct pxp_dev *dev = platform_get_drvdata(pdev);
...@@ -1922,8 +1922,6 @@ static int pxp_remove(struct platform_device *pdev) ...@@ -1922,8 +1922,6 @@ static int pxp_remove(struct platform_device *pdev)
video_unregister_device(&dev->vfd); video_unregister_device(&dev->vfd);
v4l2_m2m_release(dev->m2m_dev); v4l2_m2m_release(dev->m2m_dev);
v4l2_device_unregister(&dev->v4l2_dev); v4l2_device_unregister(&dev->v4l2_dev);
return 0;
} }
static const struct pxp_pdata pxp_imx6ull_pdata = { static const struct pxp_pdata pxp_imx6ull_pdata = {
...@@ -1943,7 +1941,7 @@ MODULE_DEVICE_TABLE(of, pxp_dt_ids); ...@@ -1943,7 +1941,7 @@ MODULE_DEVICE_TABLE(of, pxp_dt_ids);
static struct platform_driver pxp_driver = { static struct platform_driver pxp_driver = {
.probe = pxp_probe, .probe = pxp_probe,
.remove = pxp_remove, .remove_new = pxp_remove,
.driver = { .driver = {
.name = MEM2MEM_NAME, .name = MEM2MEM_NAME,
.of_match_table = pxp_dt_ids, .of_match_table = pxp_dt_ids,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment