Skip to content

Commit 9725877

Browse files
Uwe Kleine-Königlinusw
authored andcommitted
pinctrl: rockchip: 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]> Reviewed-by: Heiko Stuebner <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent f0c3958 commit 9725877

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/pinctrl/pinctrl-rockchip.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3429,7 +3429,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
34293429
return 0;
34303430
}
34313431

3432-
static int rockchip_pinctrl_remove(struct platform_device *pdev)
3432+
static void rockchip_pinctrl_remove(struct platform_device *pdev)
34333433
{
34343434
struct rockchip_pinctrl *info = platform_get_drvdata(pdev);
34353435
struct rockchip_pin_bank *bank;
@@ -3450,8 +3450,6 @@ static int rockchip_pinctrl_remove(struct platform_device *pdev)
34503450
}
34513451
mutex_unlock(&bank->deferred_lock);
34523452
}
3453-
3454-
return 0;
34553453
}
34563454

34573455
static struct rockchip_pin_bank px30_pin_banks[] = {
@@ -3982,7 +3980,7 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = {
39823980

39833981
static struct platform_driver rockchip_pinctrl_driver = {
39843982
.probe = rockchip_pinctrl_probe,
3985-
.remove = rockchip_pinctrl_remove,
3983+
.remove_new = rockchip_pinctrl_remove,
39863984
.driver = {
39873985
.name = "rockchip-pinctrl",
39883986
.pm = &rockchip_pinctrl_dev_pm_ops,

0 commit comments

Comments
 (0)