Skip to content

Commit 583d807

Browse files
Uwe Kleine-Königgeertu
authored andcommitted
pinctrl: renesas: rzn1: 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> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20231009083856.222030-20-u.kleine-koenig@pengutronix.de Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
1 parent c6a088e commit 583d807

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/pinctrl/renesas/pinctrl-rzn1.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -920,13 +920,11 @@ static int rzn1_pinctrl_probe(struct platform_device *pdev)
920920
return ret;
921921
}
922922

923-
static int rzn1_pinctrl_remove(struct platform_device *pdev)
923+
static void rzn1_pinctrl_remove(struct platform_device *pdev)
924924
{
925925
struct rzn1_pinctrl *ipctl = platform_get_drvdata(pdev);
926926

927927
clk_disable_unprepare(ipctl->clk);
928-
929-
return 0;
930928
}
931929

932930
static const struct of_device_id rzn1_pinctrl_match[] = {
@@ -937,7 +935,7 @@ MODULE_DEVICE_TABLE(of, rzn1_pinctrl_match);
937935

938936
static struct platform_driver rzn1_pinctrl_driver = {
939937
.probe = rzn1_pinctrl_probe,
940-
.remove = rzn1_pinctrl_remove,
938+
.remove_new = rzn1_pinctrl_remove,
941939
.driver = {
942940
.name = "rzn1-pinctrl",
943941
.of_match_table = rzn1_pinctrl_match,

0 commit comments

Comments
 (0)