Skip to content

Commit 06d0cb6

Browse files
Uwe Kleine-KönigAndi Shyti
authored andcommitted
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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Chunyan Zhang <zhang.lyra@gmail.com> Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent 5d85665 commit 06d0cb6

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/i2c/busses/i2c-sprd.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ static int sprd_i2c_probe(struct platform_device *pdev)
570570
return ret;
571571
}
572572

573-
static int sprd_i2c_remove(struct platform_device *pdev)
573+
static void sprd_i2c_remove(struct platform_device *pdev)
574574
{
575575
struct sprd_i2c *i2c_dev = platform_get_drvdata(pdev);
576576
int ret;
@@ -586,8 +586,6 @@ static int sprd_i2c_remove(struct platform_device *pdev)
586586

587587
pm_runtime_put_noidle(i2c_dev->dev);
588588
pm_runtime_disable(i2c_dev->dev);
589-
590-
return 0;
591589
}
592590

593591
static int __maybe_unused sprd_i2c_suspend_noirq(struct device *dev)
@@ -645,7 +643,7 @@ MODULE_DEVICE_TABLE(of, sprd_i2c_of_match);
645643

646644
static struct platform_driver sprd_i2c_driver = {
647645
.probe = sprd_i2c_probe,
648-
.remove = sprd_i2c_remove,
646+
.remove_new = sprd_i2c_remove,
649647
.driver = {
650648
.name = "sprd-i2c",
651649
.of_match_table = sprd_i2c_of_match,

0 commit comments

Comments
 (0)