Commit 06d0cb6c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Andi Shyti

i2c: sprd: 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 ignored (apart
from emitting a warning) 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. Eventually after all drivers
are converted, .remove_new() will be renamed to .remove().

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>
Acked-by: default avatarChunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 5d856651
...@@ -570,7 +570,7 @@ static int sprd_i2c_probe(struct platform_device *pdev) ...@@ -570,7 +570,7 @@ static int sprd_i2c_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int sprd_i2c_remove(struct platform_device *pdev) static void sprd_i2c_remove(struct platform_device *pdev)
{ {
struct sprd_i2c *i2c_dev = platform_get_drvdata(pdev); struct sprd_i2c *i2c_dev = platform_get_drvdata(pdev);
int ret; int ret;
...@@ -586,8 +586,6 @@ static int sprd_i2c_remove(struct platform_device *pdev) ...@@ -586,8 +586,6 @@ static int sprd_i2c_remove(struct platform_device *pdev)
pm_runtime_put_noidle(i2c_dev->dev); pm_runtime_put_noidle(i2c_dev->dev);
pm_runtime_disable(i2c_dev->dev); pm_runtime_disable(i2c_dev->dev);
return 0;
} }
static int __maybe_unused sprd_i2c_suspend_noirq(struct device *dev) static int __maybe_unused sprd_i2c_suspend_noirq(struct device *dev)
...@@ -645,7 +643,7 @@ MODULE_DEVICE_TABLE(of, sprd_i2c_of_match); ...@@ -645,7 +643,7 @@ MODULE_DEVICE_TABLE(of, sprd_i2c_of_match);
static struct platform_driver sprd_i2c_driver = { static struct platform_driver sprd_i2c_driver = {
.probe = sprd_i2c_probe, .probe = sprd_i2c_probe,
.remove = sprd_i2c_remove, .remove_new = sprd_i2c_remove,
.driver = { .driver = {
.name = "sprd-i2c", .name = "sprd-i2c",
.of_match_table = sprd_i2c_of_match, .of_match_table = sprd_i2c_of_match,
......
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