Commit 36036510 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman

staging: vc04_services: bcm2835-camera: 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>
Link: https://lore.kernel.org/r/20230403154014.2564054-24-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c46d4073
...@@ -1976,7 +1976,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) ...@@ -1976,7 +1976,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int bcm2835_mmal_remove(struct platform_device *pdev) static void bcm2835_mmal_remove(struct platform_device *pdev)
{ {
int camera; int camera;
struct vchiq_mmal_instance *instance = gdev[0]->instance; struct vchiq_mmal_instance *instance = gdev[0]->instance;
...@@ -1986,13 +1986,11 @@ static int bcm2835_mmal_remove(struct platform_device *pdev) ...@@ -1986,13 +1986,11 @@ static int bcm2835_mmal_remove(struct platform_device *pdev)
gdev[camera] = NULL; gdev[camera] = NULL;
} }
vchiq_mmal_finalise(instance); vchiq_mmal_finalise(instance);
return 0;
} }
static struct platform_driver bcm2835_camera_driver = { static struct platform_driver bcm2835_camera_driver = {
.probe = bcm2835_mmal_probe, .probe = bcm2835_mmal_probe,
.remove = bcm2835_mmal_remove, .remove_new = bcm2835_mmal_remove,
.driver = { .driver = {
.name = "bcm2835-camera", .name = "bcm2835-camera",
}, },
......
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