Commit 459ce214 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Hans Verkuil

media: fimc-is-i2c: 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 5de68c11
...@@ -82,14 +82,12 @@ static int fimc_is_i2c_probe(struct platform_device *pdev) ...@@ -82,14 +82,12 @@ static int fimc_is_i2c_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int fimc_is_i2c_remove(struct platform_device *pdev) static void fimc_is_i2c_remove(struct platform_device *pdev)
{ {
struct fimc_is_i2c *isp_i2c = platform_get_drvdata(pdev); struct fimc_is_i2c *isp_i2c = platform_get_drvdata(pdev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
i2c_del_adapter(&isp_i2c->adapter); i2c_del_adapter(&isp_i2c->adapter);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
...@@ -140,7 +138,7 @@ static const struct of_device_id fimc_is_i2c_of_match[] = { ...@@ -140,7 +138,7 @@ static const struct of_device_id fimc_is_i2c_of_match[] = {
static struct platform_driver fimc_is_i2c_driver = { static struct platform_driver fimc_is_i2c_driver = {
.probe = fimc_is_i2c_probe, .probe = fimc_is_i2c_probe,
.remove = fimc_is_i2c_remove, .remove_new = fimc_is_i2c_remove,
.driver = { .driver = {
.of_match_table = fimc_is_i2c_of_match, .of_match_table = fimc_is_i2c_of_match,
.name = "fimc-isp-i2c", .name = "fimc-isp-i2c",
......
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