| Message ID | 20200530204955.588962-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 11d8da5cabf7c6c3263ba2cd9c00260395867048 |
| Headers | show |
| Series | pinctrl: freescale: imx: Fix an error handling path in 'imx_pinctrl_probe()' | expand |
> From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Sent: Sunday, May 31, 2020 4:50 AM > > 'pinctrl_unregister()' should not be called to undo > 'devm_pinctrl_register_and_init()', it is already handled by the framework. > > This simplifies the error handling paths of the probe function. > The 'imx_free_resources()' can be removed as well. > > Fixes: a51c158bf0f7 ("pinctrl: imx: use radix trees for groups and functions") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com> Regards Aisheng
On Sat, May 30, 2020 at 10:49:55PM +0200, Christophe JAILLET wrote: > 'pinctrl_unregister()' should not be called to undo > 'devm_pinctrl_register_and_init()', it is already handled by the framework. > > This simplifies the error handling paths of the probe function. > The 'imx_free_resources()' can be removed as well. > > Fixes: a51c158bf0f7 ("pinctrl: imx: use radix trees for groups and functions") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- You didn't introduce this but the: ipctl->input_sel_base = of_iomap(np, 0); should be changed to devm_of_iomap(). regards, dan carpenter
Le 02/06/2020 à 12:13, Dan Carpenter a écrit : > On Sat, May 30, 2020 at 10:49:55PM +0200, Christophe JAILLET wrote: >> 'pinctrl_unregister()' should not be called to undo >> 'devm_pinctrl_register_and_init()', it is already handled by the framework. >> >> This simplifies the error handling paths of the probe function. >> The 'imx_free_resources()' can be removed as well. >> >> Fixes: a51c158bf0f7 ("pinctrl: imx: use radix trees for groups and functions") >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> >> --- > You didn't introduce this but the: > > ipctl->input_sel_base = of_iomap(np, 0); > > should be changed to devm_of_iomap(). Done as a separated patch. Thx for the review and the comment. CJ > regards, > dan carpenter
On Sat, May 30, 2020 at 10:49 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > 'pinctrl_unregister()' should not be called to undo > 'devm_pinctrl_register_and_init()', it is already handled by the framework. > > This simplifies the error handling paths of the probe function. > The 'imx_free_resources()' can be removed as well. > > Fixes: a51c158bf0f7 ("pinctrl: imx: use radix trees for groups and functions") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Patch applied! Yours, Linus Walleij
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 9f42036c5fbb..1f81569c7ae3 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -774,16 +774,6 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev, return 0; } -/* - * imx_free_resources() - free memory used by this driver - * @info: info driver instance - */ -static void imx_free_resources(struct imx_pinctrl *ipctl) -{ - if (ipctl->pctl) - pinctrl_unregister(ipctl->pctl); -} - int imx_pinctrl_probe(struct platform_device *pdev, const struct imx_pinctrl_soc_info *info) { @@ -874,23 +864,18 @@ int imx_pinctrl_probe(struct platform_device *pdev, &ipctl->pctl); if (ret) { dev_err(&pdev->dev, "could not register IMX pinctrl driver\n"); - goto free; + return ret; } ret = imx_pinctrl_probe_dt(pdev, ipctl); if (ret) { dev_err(&pdev->dev, "fail to probe dt properties\n"); - goto free; + return ret; } dev_info(&pdev->dev, "initialized IMX pinctrl driver\n"); return pinctrl_enable(ipctl->pctl); - -free: - imx_free_resources(ipctl); - - return ret; } static int __maybe_unused imx_pinctrl_suspend(struct device *dev)
'pinctrl_unregister()' should not be called to undo 'devm_pinctrl_register_and_init()', it is already handled by the framework. This simplifies the error handling paths of the probe function. The 'imx_free_resources()' can be removed as well. Fixes: a51c158bf0f7 ("pinctrl: imx: use radix trees for groups and functions") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/pinctrl/freescale/pinctrl-imx.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)