Skip to content

Commit 09416e0

Browse files
Uwe Kleine-Königjwrdegoede
authored andcommitted
platform/surface: aggregator-registry: 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() is 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: Maximilian Luz <luzmaximilian@gmail.com> Link: https://lore.kernel.org/r/20230917203805.1149595-5-u.kleine-koenig@pengutronix.de Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent 1cc995a commit 09416e0

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/platform/surface/surface_aggregator_registry.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,19 +418,18 @@ static int ssam_platform_hub_probe(struct platform_device *pdev)
418418
return status;
419419
}
420420

421-
static int ssam_platform_hub_remove(struct platform_device *pdev)
421+
static void ssam_platform_hub_remove(struct platform_device *pdev)
422422
{
423423
const struct software_node **nodes = platform_get_drvdata(pdev);
424424

425425
ssam_remove_clients(&pdev->dev);
426426
set_secondary_fwnode(&pdev->dev, NULL);
427427
software_node_unregister_node_group(nodes);
428-
return 0;
429428
}
430429

431430
static struct platform_driver ssam_platform_hub_driver = {
432431
.probe = ssam_platform_hub_probe,
433-
.remove = ssam_platform_hub_remove,
432+
.remove_new = ssam_platform_hub_remove,
434433
.driver = {
435434
.name = "surface_aggregator_platform_hub",
436435
.acpi_match_table = ssam_platform_hub_match,

0 commit comments

Comments
 (0)