lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 36/80] clk: core: Fix runtime PM sequence in clk_core_unprepare()
    Date
    From: Chen-Yu Tsai <wenst@chromium.org>

    [ Upstream commit 4b592061f7b3971c70e8b72fc42aaead47c24701 ]

    In the original commit 9a34b45397e5 ("clk: Add support for runtime PM"),
    the commit message mentioned that pm_runtime_put_sync() would be done
    at the end of clk_core_unprepare(). This mirrors the operations in
    clk_core_prepare() in the opposite order.

    However, the actual code that was added wasn't in the order the commit
    message described. Move clk_pm_runtime_put() to the end of
    clk_core_unprepare() so that it is in the correct order.

    Fixes: 9a34b45397e5 ("clk: Add support for runtime PM")
    Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
    Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
    Link: https://lore.kernel.org/r/20220822081424.1310926-3-wenst@chromium.org
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/clk.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
    index 2e56cc0a3bce6..b355d3d40f63a 100644
    --- a/drivers/clk/clk.c
    +++ b/drivers/clk/clk.c
    @@ -846,10 +846,9 @@ static void clk_core_unprepare(struct clk_core *core)
    if (core->ops->unprepare)
    core->ops->unprepare(core->hw);

    - clk_pm_runtime_put(core);
    -
    trace_clk_unprepare_complete(core);
    clk_core_unprepare(core->parent);
    + clk_pm_runtime_put(core);
    }

    static void clk_core_unprepare_lock(struct clk_core *core)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-06 15:37    [W:4.025 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site