Skip to content

Commit fef1467

Browse files
committed
clk: mediatek: Migrate remaining clk_unregister_*() to clk_hw_unregister_*()
During the previous |struct clk| to |struct clk_hw| clk provider API migration in commit 6f691a5 ("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: 6f691a5 ("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>
1 parent 20f7a0d commit fef1467

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/clk/mediatek/clk-mtk.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num,
8080
if (IS_ERR_OR_NULL(clk_data->hws[rc->id]))
8181
continue;
8282

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

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

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

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

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

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

417-
clk_unregister_divider(clk_data->hws[mcd->id]->clk);
417+
clk_hw_unregister_divider(clk_data->hws[mcd->id]);
418418
clk_data->hws[mcd->id] = ERR_PTR(-ENOENT);
419419
}
420420
}

0 commit comments

Comments
 (0)