| Message ID | 20231009083856.222030-20-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 583d8073205566468abf3a34000fccdd1d19c9cc |
| Headers | show |
| Series | [01/20] pinctrl: stmfx: Improve error message in .remove()'s error path | expand |
On Mon, Oct 9, 2023 at 11:39 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > Linus: do you plan to take this whole series directly? > If yes: > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Otherwise, I can queue it in renesas-pinctrl-for-v6.7 for my > second PR for v6.7 this Friday. You pick it! Andy is already picking the Intel changes, so it is better to refer to submaintainers where we have them! Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Hi Linus, On Tue, Oct 10, 2023 at 3:45 PM Linus Walleij <linus.walleij@linaro.org> wrote: > On Mon, Oct 9, 2023 at 11:39 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > Linus: do you plan to take this whole series directly? > > If yes: > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > > Otherwise, I can queue it in renesas-pinctrl-for-v6.7 for my > > second PR for v6.7 this Friday. > > You pick it! Andy is already picking the Intel changes, so it > is better to refer to submaintainers where we have them! OK. > Acked-by: Linus Walleij <linus.walleij@linaro.org> Thanks! Gr{oetje,eeting}s, Geert
diff --git a/drivers/pinctrl/renesas/pinctrl-rzn1.c b/drivers/pinctrl/renesas/pinctrl-rzn1.c index 374b9f281324..4b2f107824fe 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzn1.c +++ b/drivers/pinctrl/renesas/pinctrl-rzn1.c @@ -920,13 +920,11 @@ static int rzn1_pinctrl_probe(struct platform_device *pdev) return ret; } -static int rzn1_pinctrl_remove(struct platform_device *pdev) +static void rzn1_pinctrl_remove(struct platform_device *pdev) { struct rzn1_pinctrl *ipctl = platform_get_drvdata(pdev); clk_disable_unprepare(ipctl->clk); - - return 0; } static const struct of_device_id rzn1_pinctrl_match[] = { @@ -937,7 +935,7 @@ MODULE_DEVICE_TABLE(of, rzn1_pinctrl_match); static struct platform_driver rzn1_pinctrl_driver = { .probe = rzn1_pinctrl_probe, - .remove = rzn1_pinctrl_remove, + .remove_new = rzn1_pinctrl_remove, .driver = { .name = "rzn1-pinctrl", .of_match_table = rzn1_pinctrl_match,
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> --- drivers/pinctrl/renesas/pinctrl-rzn1.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)