Skip to content

Commit d0e7177

Browse files
Uwe Kleine-Königandreas-gaisler
authored andcommitted
sbus: bbc_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 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> Reviewed-by: Andreas Larsson <andreas@gaisler.com> Signed-off-by: Andreas Larsson <andreas@gaisler.com> Link: https://lore.kernel.org/r/a5ba9d930451d1eeabc4208cc6c75184a92a248d.1709591118.git.u.kleine-koenig@pengutronix.de
1 parent 61fc8d4 commit d0e7177

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/sbus/char/bbc_i2c.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ static int bbc_i2c_probe(struct platform_device *op)
382382
return err;
383383
}
384384

385-
static int bbc_i2c_remove(struct platform_device *op)
385+
static void bbc_i2c_remove(struct platform_device *op)
386386
{
387387
struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);
388388

@@ -396,8 +396,6 @@ static int bbc_i2c_remove(struct platform_device *op)
396396
of_iounmap(&op->resource[1], bp->i2c_control_regs, 2);
397397

398398
kfree(bp);
399-
400-
return 0;
401399
}
402400

403401
static const struct of_device_id bbc_i2c_match[] = {
@@ -415,7 +413,7 @@ static struct platform_driver bbc_i2c_driver = {
415413
.of_match_table = bbc_i2c_match,
416414
},
417415
.probe = bbc_i2c_probe,
418-
.remove = bbc_i2c_remove,
416+
.remove_new = bbc_i2c_remove,
419417
};
420418

421419
module_platform_driver(bbc_i2c_driver);

0 commit comments

Comments
 (0)