Remove mtk_common_clk_infrasys_init() and replace callers with mtk_common_clk_init() as there is no longer any difference between these functions.
Signed-off-by: David Lechner <[email protected]> --- drivers/clk/mediatek/clk-mt7622.c | 4 ++-- drivers/clk/mediatek/clk-mt7623.c | 2 +- drivers/clk/mediatek/clk-mt7981.c | 2 +- drivers/clk/mediatek/clk-mt7986.c | 2 +- drivers/clk/mediatek/clk-mt7987.c | 2 +- drivers/clk/mediatek/clk-mt7988.c | 2 +- drivers/clk/mediatek/clk-mt8189.c | 2 +- drivers/clk/mediatek/clk-mtk.c | 6 ------ drivers/clk/mediatek/clk-mtk.h | 2 -- 9 files changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index aba870bf0f3..6cee27e2df9 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -699,12 +699,12 @@ static int mt7622_topckgen_probe(struct udevice *dev) static int mt7622_infracfg_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt7622_infra_clk_tree); + return mtk_common_clk_init(dev, &mt7622_infra_clk_tree); } static int mt7622_pericfg_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt7622_peri_clk_tree); + return mtk_common_clk_init(dev, &mt7622_peri_clk_tree); } static int mt7622_pciesys_probe(struct udevice *dev) diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c index 348b8c1e85f..38351e5c5d9 100644 --- a/drivers/clk/mediatek/clk-mt7623.c +++ b/drivers/clk/mediatek/clk-mt7623.c @@ -1090,7 +1090,7 @@ static const struct mtk_clk_tree mt7623_clk_peri_tree = { static int mt7623_pericfg_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt7623_clk_peri_tree); + return mtk_common_clk_init(dev, &mt7623_clk_peri_tree); } static int mt7623_hifsys_probe(struct udevice *dev) diff --git a/drivers/clk/mediatek/clk-mt7981.c b/drivers/clk/mediatek/clk-mt7981.c index 23d34a315fb..debee21fcc5 100644 --- a/drivers/clk/mediatek/clk-mt7981.c +++ b/drivers/clk/mediatek/clk-mt7981.c @@ -716,7 +716,7 @@ static const struct udevice_id mt7981_infracfg_compat[] = { static int mt7981_infracfg_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt7981_infracfg_clk_tree); + return mtk_common_clk_init(dev, &mt7981_infracfg_clk_tree); } U_BOOT_DRIVER(mtk_clk_infracfg) = { diff --git a/drivers/clk/mediatek/clk-mt7986.c b/drivers/clk/mediatek/clk-mt7986.c index a5301fbe8cf..5f40b782f4d 100644 --- a/drivers/clk/mediatek/clk-mt7986.c +++ b/drivers/clk/mediatek/clk-mt7986.c @@ -624,7 +624,7 @@ static const struct udevice_id mt7986_infracfg_compat[] = { static int mt7986_infracfg_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt7986_infracfg_clk_tree); + return mtk_common_clk_init(dev, &mt7986_infracfg_clk_tree); } U_BOOT_DRIVER(mtk_clk_infracfg) = { diff --git a/drivers/clk/mediatek/clk-mt7987.c b/drivers/clk/mediatek/clk-mt7987.c index 27367de82ff..b45cd5106b4 100644 --- a/drivers/clk/mediatek/clk-mt7987.c +++ b/drivers/clk/mediatek/clk-mt7987.c @@ -803,7 +803,7 @@ static const struct udevice_id mt7987_infracfg_compat[] = { static int mt7987_infracfg_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt7987_infracfg_clk_tree); + return mtk_common_clk_init(dev, &mt7987_infracfg_clk_tree); } U_BOOT_DRIVER(mtk_clk_infracfg) = { diff --git a/drivers/clk/mediatek/clk-mt7988.c b/drivers/clk/mediatek/clk-mt7988.c index 309b6e03ceb..011dbc8e7aa 100644 --- a/drivers/clk/mediatek/clk-mt7988.c +++ b/drivers/clk/mediatek/clk-mt7988.c @@ -900,7 +900,7 @@ static const struct udevice_id mt7988_infracfg_compat[] = { static int mt7988_infracfg_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt7988_infracfg_clk_tree); + return mtk_common_clk_init(dev, &mt7988_infracfg_clk_tree); } U_BOOT_DRIVER(mtk_clk_infracfg) = { diff --git a/drivers/clk/mediatek/clk-mt8189.c b/drivers/clk/mediatek/clk-mt8189.c index 25b88198fd8..c8804583b32 100644 --- a/drivers/clk/mediatek/clk-mt8189.c +++ b/drivers/clk/mediatek/clk-mt8189.c @@ -2031,7 +2031,7 @@ static int mt8189_topckgen_probe(struct udevice *dev) static int mt8189_infrasys_probe(struct udevice *dev) { - return mtk_common_clk_infrasys_init(dev, &mt8189_vlpckgen_clk_tree); + return mtk_common_clk_init(dev, &mt8189_vlpckgen_clk_tree); } static int mt8189_clk_gate_probe(struct udevice *dev) diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 52d3428438a..61d718f162d 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -1200,12 +1200,6 @@ int mtk_common_clk_init(struct udevice *dev, const struct mtk_clk_tree *tree) return mtk_clk_tree_register_provider(dev, tree); } -int mtk_common_clk_infrasys_init(struct udevice *dev, - const struct mtk_clk_tree *tree) -{ - return mtk_common_clk_init(dev, tree); -} - int mtk_common_clk_gate_init(struct udevice *dev, const struct mtk_clk_tree *tree, const struct mtk_gate *gates, int num_gates, diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index 2993dc35efb..437797dd0df 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -301,8 +301,6 @@ extern const struct clk_ops mtk_clk_gate_ops; int mtk_common_clk_parent_bind(struct udevice *dev); int mtk_common_clk_init(struct udevice *dev, const struct mtk_clk_tree *tree); -int mtk_common_clk_infrasys_init(struct udevice *dev, - const struct mtk_clk_tree *tree); int mtk_common_clk_gate_init(struct udevice *dev, const struct mtk_clk_tree *tree, const struct mtk_gate *gates, int num_gates, -- 2.43.0
