Skip to content

Commit 342d7dc

Browse files
Uwe Kleine-Königjwrdegoede
authored andcommitted
platform/surface: acpi-notify: 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-3-u.kleine-koenig@pengutronix.de Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent 8d53109 commit 342d7dc

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/platform/surface/surface_acpi_notify.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ static int san_probe(struct platform_device *pdev)
850850
return status;
851851
}
852852

853-
static int san_remove(struct platform_device *pdev)
853+
static void san_remove(struct platform_device *pdev)
854854
{
855855
acpi_handle san = ACPI_HANDLE(&pdev->dev);
856856

@@ -864,8 +864,6 @@ static int san_remove(struct platform_device *pdev)
864864
* all delayed works they may have spawned are run to completion.
865865
*/
866866
flush_workqueue(san_wq);
867-
868-
return 0;
869867
}
870868

871869
static const struct acpi_device_id san_match[] = {
@@ -876,7 +874,7 @@ MODULE_DEVICE_TABLE(acpi, san_match);
876874

877875
static struct platform_driver surface_acpi_notify = {
878876
.probe = san_probe,
879-
.remove = san_remove,
877+
.remove_new = san_remove,
880878
.driver = {
881879
.name = "surface_acpi_notify",
882880
.acpi_match_table = san_match,

0 commit comments

Comments
 (0)