Skip to content

Commit d637a75

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
regulator: virtual: 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> Link: https://msgid.link/r/d9954f02ae51b1b0b0077c710d16bfaeafa216ec.1701778038.git.u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 3b2e8e9 commit d637a75

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/regulator/virtual.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,21 +345,19 @@ static int regulator_virtual_probe(struct platform_device *pdev)
345345
return 0;
346346
}
347347

348-
static int regulator_virtual_remove(struct platform_device *pdev)
348+
static void regulator_virtual_remove(struct platform_device *pdev)
349349
{
350350
struct virtual_consumer_data *drvdata = platform_get_drvdata(pdev);
351351

352352
sysfs_remove_group(&pdev->dev.kobj, &regulator_virtual_attr_group);
353353

354354
if (drvdata->enabled)
355355
regulator_disable(drvdata->regulator);
356-
357-
return 0;
358356
}
359357

360358
static struct platform_driver regulator_virtual_consumer_driver = {
361359
.probe = regulator_virtual_probe,
362-
.remove = regulator_virtual_remove,
360+
.remove_new = regulator_virtual_remove,
363361
.driver = {
364362
.name = "reg-virt-consumer",
365363
.probe_type = PROBE_PREFER_ASYNCHRONOUS,

0 commit comments

Comments
 (0)