Skip to content

Commit

Permalink
HSI: omap_ssi_core: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
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://lore.kernel.org/r/bc6b1caafa977346b33c1040d0f8e616bc0457bf.1712756364.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  • Loading branch information
Uwe Kleine-König authored and Sebastian Reichel committed Apr 16, 2024
1 parent 4cece76 commit 94eabdd
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/hsi/controllers/omap_ssi_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ static int ssi_probe(struct platform_device *pd)
return err;
}

static int ssi_remove(struct platform_device *pd)
static void ssi_remove(struct platform_device *pd)
{
struct hsi_controller *ssi = platform_get_drvdata(pd);

Expand All @@ -561,8 +561,6 @@ static int ssi_remove(struct platform_device *pd)
platform_set_drvdata(pd, NULL);

pm_runtime_disable(&pd->dev);

return 0;
}

#ifdef CONFIG_PM
Expand Down Expand Up @@ -618,7 +616,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_of_match);

static struct platform_driver ssi_pdriver = {
.probe = ssi_probe,
.remove = ssi_remove,
.remove_new = ssi_remove,
.driver = {
.name = "omap_ssi",
.pm = DEV_PM_OPS,
Expand Down

0 comments on commit 94eabdd

Please sign in to comment.