On Tue, 2022-02-08 at 20:40 +0800, Chen-Yu Tsai wrote:
> struct mtk_clk_gate and mtk_clk_register_gate() are not used outside
> of
> the gate clk library. Only the API that handles a list of clks is
> used
> by the individual platform clk drivers.
>
> Internalize the parts that aren't used outside of the implementation.
>
> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
> Reviewed-by: Miles Chen <miles.chen@mediatek.com>
> Reviewed-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@collabora.com>
Reviewed-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>
> ---
> drivers/clk/mediatek/clk-gate.c | 35 ++++++++++++++++++++++---------
> --
> drivers/clk/mediatek/clk-gate.h | 31 ++---------------------------
> 2 files changed, 25 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-gate.c
> b/drivers/clk/mediatek/clk-gate.c
> index 54921768bfba..e51cfd8c653c 100644
> --- a/drivers/clk/mediatek/clk-gate.c
> +++ b/drivers/clk/mediatek/clk-gate.c
> @@ -11,11 +11,28 @@
> #include <linux/slab.h>
> #include <linux/delay.h>
> #include <linux/clkdev.h>
> +#include <linux/clk-provider.h>
> +#include <linux/container_of.h>
> #include <linux/mfd/syscon.h>
> #include <linux/module.h>
> +#include <linux/regmap.h>
>
> #include "clk-gate.h"
>
> +struct mtk_clk_gate {
> + struct clk_hw hw;
> + struct regmap *regmap;
> + int set_ofs;
> + int clr_ofs;
> + int sta_ofs;
> + u8 bit;
> +};
> +
> +static inline struct mtk_clk_gate *to_mtk_clk_gate(struct clk_hw
> *hw)
> +{
> + return container_of(hw, struct mtk_clk_gate, hw);
> +}
> +
> static u32 mtk_get_clockgating(struct clk_hw *hw)
> {
> struct mtk_clk_gate *cg = to_mtk_clk_gate(hw);
> @@ -140,17 +157,12 @@ const struct clk_ops
> mtk_clk_gate_ops_no_setclr_inv = {
> };
> EXPORT_SYMBOL_GPL(mtk_clk_gate_ops_no_setclr_inv);
>
> -struct clk *mtk_clk_register_gate(
> - const char *name,
> - const char *parent_name,
> - struct regmap *regmap,
> - int set_ofs,
> - int clr_ofs,
> - int sta_ofs,
> - u8 bit,
> - const struct clk_ops *ops,
> - unsigned long flags,
> - struct device *dev)
> +static struct clk *mtk_clk_register_gate(const char *name,
> + const char *parent_name,
> + struct regmap *regmap, int
> set_ofs,
> + int clr_ofs, int sta_ofs, u8
> bit,
> + const struct clk_ops *ops,
> + unsigned long flags, struct
> device *dev)
> {
> struct mtk_clk_gate *cg;
> struct clk *clk;
> @@ -180,7 +192,6 @@ struct clk *mtk_clk_register_gate(
>
> return clk;
> }
> -EXPORT_SYMBOL_GPL(mtk_clk_register_gate);
>
> int mtk_clk_register_gates_with_dev(struct device_node *node,
> const struct mtk_gate *clks, int
> num,
> diff --git a/drivers/clk/mediatek/clk-gate.h
> b/drivers/clk/mediatek/clk-gate.h
> index 432b571d23b3..3d75521ba20c 100644
> --- a/drivers/clk/mediatek/clk-gate.h
> +++ b/drivers/clk/mediatek/clk-gate.h
> @@ -7,42 +7,15 @@
> #ifndef __DRV_CLK_GATE_H
> #define __DRV_CLK_GATE_H
>
> -#include <linux/regmap.h>
> #include <linux/clk-provider.h>
> -
> -struct clk;
> -
> -struct mtk_clk_gate {
> - struct clk_hw hw;
> - struct regmap *regmap;
> - int set_ofs;
> - int clr_ofs;
> - int sta_ofs;
> - u8 bit;
> -};
> -
> -static inline struct mtk_clk_gate *to_mtk_clk_gate(struct clk_hw
> *hw)
> -{
> - return container_of(hw, struct mtk_clk_gate, hw);
> -}
> +#include <linux/device.h>
> +#include <linux/of.h>
>
> extern const struct clk_ops mtk_clk_gate_ops_setclr;
> extern const struct clk_ops mtk_clk_gate_ops_setclr_inv;
> extern const struct clk_ops mtk_clk_gate_ops_no_setclr;
> extern const struct clk_ops mtk_clk_gate_ops_no_setclr_inv;
>
> -struct clk *mtk_clk_register_gate(
> - const char *name,
> - const char *parent_name,
> - struct regmap *regmap,
> - int set_ofs,
> - int clr_ofs,
> - int sta_ofs,
> - u8 bit,
> - const struct clk_ops *ops,
> - unsigned long flags,
> - struct device *dev);
> -
> struct mtk_gate_regs {
> u32 sta_ofs;
> u32 clr_ofs;