Skip to content

Commit

Permalink
pinctrl: artpec6: 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]>
Acked-by: Jesper Nilsson <[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 23a35fd commit b340412
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/pinctrl/pinctrl-artpec6.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,13 +970,11 @@ static int artpec6_pmx_probe(struct platform_device *pdev)
return 0;
}

static int artpec6_pmx_remove(struct platform_device *pdev)
static void artpec6_pmx_remove(struct platform_device *pdev)
{
struct artpec6_pmx *pmx = platform_get_drvdata(pdev);

pinctrl_unregister(pmx->pctl);

return 0;
}

static const struct of_device_id artpec6_pinctrl_match[] = {
Expand All @@ -990,7 +988,7 @@ static struct platform_driver artpec6_pmx_driver = {
.of_match_table = artpec6_pinctrl_match,
},
.probe = artpec6_pmx_probe,
.remove = artpec6_pmx_remove,
.remove_new = artpec6_pmx_remove,
};

static int __init artpec6_pmx_init(void)
Expand Down

0 comments on commit b340412

Please sign in to comment.