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 | 7 ------- drivers/clk/mediatek/clk-mtk.h | 2 -- 9 files changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index fd51173a701..afe1717bfc5 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 16894a68e3f..994413a6a1b 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 5d6af62664e..f7b2e559baa 100644 --- a/drivers/clk/mediatek/clk-mt7981.c +++ b/drivers/clk/mediatek/clk-mt7981.c @@ -714,7 +714,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 fa12e86eade..731ed6035cf 100644 --- a/drivers/clk/mediatek/clk-mt7986.c +++ b/drivers/clk/mediatek/clk-mt7986.c @@ -622,7 +622,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 b455f52bafc..e3a95864235 100644 --- a/drivers/clk/mediatek/clk-mt7987.c +++ b/drivers/clk/mediatek/clk-mt7987.c @@ -801,7 +801,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 c8e635e457d..f4a3d40f5af 100644 --- a/drivers/clk/mediatek/clk-mt7988.c +++ b/drivers/clk/mediatek/clk-mt7988.c @@ -898,7 +898,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 ba89b3f5454..a520f4f769c 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 0afd94ed4ef..f584b26626c 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -1179,7 +1179,6 @@ const struct clk_ops mtk_clk_gate_ops = { int mtk_common_clk_init(struct udevice *dev, const struct mtk_clk_tree *tree) { struct mtk_clk_priv *priv = dev_get_priv(dev); - int ret; priv->base = dev_read_addr_ptr(dev); if (!priv->base) @@ -1190,12 +1189,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 b9b9360b4bd..59cfeeb1722 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -295,8 +295,6 @@ extern const struct clk_ops mtk_clk_gate_ops; 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
