diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2023-03-26 16:32:01 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-04-11 16:59:19 +0200 |
| commit | 7234c7258cb4adb51f8474f4fe299381155f41f3 (patch) | |
| tree | 27f41f4138ae18063e154ad580c73e2f6c4337d4 | |
| parent | e65db25b8d7a3d06b96f735df13a3f7d88c8b688 (diff) | |
| download | lwn-7234c7258cb4adb51f8474f4fe299381155f41f3.tar.gz lwn-7234c7258cb4adb51f8474f4fe299381155f41f3.zip | |
media: video-mux: 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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
| -rw-r--r-- | drivers/media/platform/video-mux.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c index 71d97042a470..1d9f32e5a917 100644 --- a/drivers/media/platform/video-mux.c +++ b/drivers/media/platform/video-mux.c @@ -481,7 +481,7 @@ static int video_mux_probe(struct platform_device *pdev) return ret; } -static int video_mux_remove(struct platform_device *pdev) +static void video_mux_remove(struct platform_device *pdev) { struct video_mux *vmux = platform_get_drvdata(pdev); struct v4l2_subdev *sd = &vmux->subdev; @@ -490,8 +490,6 @@ static int video_mux_remove(struct platform_device *pdev) v4l2_async_nf_cleanup(&vmux->notifier); v4l2_async_unregister_subdev(sd); media_entity_cleanup(&sd->entity); - - return 0; } static const struct of_device_id video_mux_dt_ids[] = { @@ -502,7 +500,7 @@ MODULE_DEVICE_TABLE(of, video_mux_dt_ids); static struct platform_driver video_mux_driver = { .probe = video_mux_probe, - .remove = video_mux_remove, + .remove_new = video_mux_remove, .driver = { .of_match_table = video_mux_dt_ids, .name = "video-mux", |