lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 584/862] clk: mediatek: Migrate remaining clk_unregister_*() to clk_hw_unregister_*()
    Date
    From: Chen-Yu Tsai <wenst@chromium.org>

    [ Upstream commit fef14676fc4be40b8441745a3c96b7e7d7d8592d ]

    During the previous |struct clk| to |struct clk_hw| clk provider API
    migration in commit 6f691a586296 ("clk: mediatek: Switch to clk_hw
    provider APIs"), a few clk_unregister_*() calls were missed.

    Migrate the remaining ones to the |struct clk_hw| provider API, i.e.
    change clk_unregister_*() to clk_hw_unregister_*().

    Fixes: 6f691a586296 ("clk: mediatek: Switch to clk_hw provider APIs")
    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
    Link: https://lore.kernel.org/r/20220926102523.2367530-3-wenst@chromium.org
    Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/mediatek/clk-mtk.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
    index 9b82956260d3..e1b445f2c5c5 100644
    --- a/drivers/clk/mediatek/clk-mtk.c
    +++ b/drivers/clk/mediatek/clk-mtk.c
    @@ -80,7 +80,7 @@ int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num,
    if (IS_ERR_OR_NULL(clk_data->hws[rc->id]))
    continue;

    - clk_unregister_fixed_rate(clk_data->hws[rc->id]->clk);
    + clk_hw_unregister_fixed_rate(clk_data->hws[rc->id]);
    clk_data->hws[rc->id] = ERR_PTR(-ENOENT);
    }

    @@ -102,7 +102,7 @@ void mtk_clk_unregister_fixed_clks(const struct mtk_fixed_clk *clks, int num,
    if (IS_ERR_OR_NULL(clk_data->hws[rc->id]))
    continue;

    - clk_unregister_fixed_rate(clk_data->hws[rc->id]->clk);
    + clk_hw_unregister_fixed_rate(clk_data->hws[rc->id]);
    clk_data->hws[rc->id] = ERR_PTR(-ENOENT);
    }
    }
    @@ -146,7 +146,7 @@ int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num,
    if (IS_ERR_OR_NULL(clk_data->hws[ff->id]))
    continue;

    - clk_unregister_fixed_factor(clk_data->hws[ff->id]->clk);
    + clk_hw_unregister_fixed_factor(clk_data->hws[ff->id]);
    clk_data->hws[ff->id] = ERR_PTR(-ENOENT);
    }

    @@ -168,7 +168,7 @@ void mtk_clk_unregister_factors(const struct mtk_fixed_factor *clks, int num,
    if (IS_ERR_OR_NULL(clk_data->hws[ff->id]))
    continue;

    - clk_unregister_fixed_factor(clk_data->hws[ff->id]->clk);
    + clk_hw_unregister_fixed_factor(clk_data->hws[ff->id]);
    clk_data->hws[ff->id] = ERR_PTR(-ENOENT);
    }
    }
    @@ -414,7 +414,7 @@ void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,
    if (IS_ERR_OR_NULL(clk_data->hws[mcd->id]))
    continue;

    - clk_unregister_divider(clk_data->hws[mcd->id]->clk);
    + clk_hw_unregister_divider(clk_data->hws[mcd->id]);
    clk_data->hws[mcd->id] = ERR_PTR(-ENOENT);
    }
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:42    [W:2.894 / U:0.696 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site