lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 090/136] pinctrl: freescale: imx: Fix an error handling path in imx_pinctrl_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 11d8da5cabf7c6c3263ba2cd9c00260395867048 ]

    '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>
    Link: https://lore.kernel.org/r/20200530204955.588962-1-christophe.jaillet@wanadoo.fr
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pinctrl/freescale/pinctrl-imx.c | 19 ++-----------------
    1 file changed, 2 insertions(+), 17 deletions(-)

    diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
    index 17f2c5a505b25..ec0119e1e7810 100644
    --- a/drivers/pinctrl/freescale/pinctrl-imx.c
    +++ b/drivers/pinctrl/freescale/pinctrl-imx.c
    @@ -661,16 +661,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,
    struct imx_pinctrl_soc_info *info)
    {
    @@ -761,21 +751,16 @@ 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;
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:53    [W:4.122 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site