Skip to content

Commit b340412

Browse files
Uwe Kleine-Königlinusw
authored andcommitted
pinctrl: artpec6: 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 <[email protected]> Acked-by: Jesper Nilsson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 23a35fd commit b340412

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/pinctrl/pinctrl-artpec6.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -970,13 +970,11 @@ static int artpec6_pmx_probe(struct platform_device *pdev)
970970
return 0;
971971
}
972972

973-
static int artpec6_pmx_remove(struct platform_device *pdev)
973+
static void artpec6_pmx_remove(struct platform_device *pdev)
974974
{
975975
struct artpec6_pmx *pmx = platform_get_drvdata(pdev);
976976

977977
pinctrl_unregister(pmx->pctl);
978-
979-
return 0;
980978
}
981979

982980
static const struct of_device_id artpec6_pinctrl_match[] = {
@@ -990,7 +988,7 @@ static struct platform_driver artpec6_pmx_driver = {
990988
.of_match_table = artpec6_pinctrl_match,
991989
},
992990
.probe = artpec6_pmx_probe,
993-
.remove = artpec6_pmx_remove,
991+
.remove_new = artpec6_pmx_remove,
994992
};
995993

996994
static int __init artpec6_pmx_init(void)

0 commit comments

Comments
 (0)