Skip to content

Commit

Permalink
pinctrl: stmfx: 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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Linus Walleij <[email protected]>
  • Loading branch information
Uwe Kleine-König authored and linusw committed Oct 10, 2023
1 parent a6992a0 commit 86bc4c7
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/pinctrl/pinctrl-stmfx.c
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
return 0;
}

static int stmfx_pinctrl_remove(struct platform_device *pdev)
static void stmfx_pinctrl_remove(struct platform_device *pdev)
{
struct stmfx *stmfx = dev_get_drvdata(pdev->dev.parent);
int ret;
Expand All @@ -746,8 +746,6 @@ static int stmfx_pinctrl_remove(struct platform_device *pdev)
if (ret)
dev_err(&pdev->dev, "Failed to disable pins (%pe)\n",
ERR_PTR(ret));

return 0;
}

#ifdef CONFIG_PM_SLEEP
Expand Down Expand Up @@ -856,7 +854,7 @@ static struct platform_driver stmfx_pinctrl_driver = {
.pm = &stmfx_pinctrl_dev_pm_ops,
},
.probe = stmfx_pinctrl_probe,
.remove = stmfx_pinctrl_remove,
.remove_new = stmfx_pinctrl_remove,
};
module_platform_driver(stmfx_pinctrl_driver);

Expand Down

0 comments on commit 86bc4c7

Please sign in to comment.