Skip to content

Commit

Permalink
power: reset: at91-sama5d2_shdwc: Convert to platform remove callback…
Browse files Browse the repository at this point in the history
… 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: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Link: https://lore.kernel.org/r/20231105094712.3706799-4-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 Nov 15, 2023
1 parent 20cea2b commit 054eb23
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/power/reset/at91-sama5d2_shdwc.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ static int at91_shdwc_probe(struct platform_device *pdev)
return ret;
}

static int at91_shdwc_remove(struct platform_device *pdev)
static void at91_shdwc_remove(struct platform_device *pdev)
{
struct shdwc *shdw = platform_get_drvdata(pdev);

Expand All @@ -437,13 +437,11 @@ static int at91_shdwc_remove(struct platform_device *pdev)
iounmap(shdw->pmc_base);

clk_disable_unprepare(shdw->sclk);

return 0;
}

static struct platform_driver at91_shdwc_driver = {
.probe = at91_shdwc_probe,
.remove = at91_shdwc_remove,
.remove_new = at91_shdwc_remove,
.driver = {
.name = "at91-shdwc",
.of_match_table = at91_shdwc_of_match,
Expand Down

0 comments on commit 054eb23

Please sign in to comment.