clk: mediatek: Migrate remaining clk_unregister_*() to clk_hw_unregister_*()
authorChen-Yu Tsai <wenst@chromium.org>
Mon, 26 Sep 2022 10:25:19 +0000 (18:25 +0800)
committerChen-Yu Tsai <wenst@chromium.org>
Thu, 29 Sep 2022 04:27:29 +0000 (12:27 +0800)
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>
drivers/clk/mediatek/clk-mtk.c

index 174d0645be38989fcd3549640d79dfffa5af2ee4..a8ae65302837c944bdace87025f128bd8f49c77b 100644 (file)
@@ -80,7 +80,7 @@ err:
                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 @@ err:
                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);
        }
 }