lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0452/1039] clk: renesas: rzg2l: Check return value of pm_genpd_init()
    Date
    From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

    [ Upstream commit 27527a3d3b162e4512798c058c0e8a216c721187 ]

    Make sure we check the return value of pm_genpd_init() which might fail.
    Also add a devres action to remove the power-domain in-case the probe
    callback fails further down in the code flow.

    Fixes: ef3c613ccd68a ("clk: renesas: Add CPG core wrapper for RZ/G2L SoC")
    Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
    Link: https://lore.kernel.org/r/20211117115101.28281-2-prabhakar.mahadev-lad.rj@bp.renesas.com
    Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/renesas/rzg2l-cpg.c | 14 +++++++++++++-
    1 file changed, 13 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cpg.c
    index 4021f6cabda4b..4f04ff57d468a 100644
    --- a/drivers/clk/renesas/rzg2l-cpg.c
    +++ b/drivers/clk/renesas/rzg2l-cpg.c
    @@ -850,10 +850,16 @@ static void rzg2l_cpg_detach_dev(struct generic_pm_domain *unused, struct device
    pm_clk_destroy(dev);
    }

    +static void rzg2l_cpg_genpd_remove(void *data)
    +{
    + pm_genpd_remove(data);
    +}
    +
    static int __init rzg2l_cpg_add_clk_domain(struct device *dev)
    {
    struct device_node *np = dev->of_node;
    struct generic_pm_domain *genpd;
    + int ret;

    genpd = devm_kzalloc(dev, sizeof(*genpd), GFP_KERNEL);
    if (!genpd)
    @@ -864,7 +870,13 @@ static int __init rzg2l_cpg_add_clk_domain(struct device *dev)
    GENPD_FLAG_ACTIVE_WAKEUP;
    genpd->attach_dev = rzg2l_cpg_attach_dev;
    genpd->detach_dev = rzg2l_cpg_detach_dev;
    - pm_genpd_init(genpd, &pm_domain_always_on_gov, false);
    + ret = pm_genpd_init(genpd, &pm_domain_always_on_gov, false);
    + if (ret)
    + return ret;
    +
    + ret = devm_add_action_or_reset(dev, rzg2l_cpg_genpd_remove, genpd);
    + if (ret)
    + return ret;

    of_genpd_add_provider_simple(np, genpd);
    return 0;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 01:11    [W:3.902 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site