Rename the to_mod_clock() helper macro to to_mstp_clock(), to match the type of the returned structure. Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> --- This depends on "[PATCH v2 3/8] clk: renesas: rzg2l-cpg: Add macro to loop through module clocks" https://lore.kernel.org/20250514090415.4098534-4-claudiu.beznea.uj@xxxxxxxxxxxxx, To be queued in renesas-clk for v6.17. --- drivers/clk/renesas/rzg2l-cpg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cpg.c index dc92f09d5616223b..9449a5a5714302f8 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -1200,18 +1200,18 @@ struct mstp_clock { bool enabled; }; -#define to_mod_clock(_hw) container_of(_hw, struct mstp_clock, hw) +#define to_mstp_clock(_hw) container_of(_hw, struct mstp_clock, hw) #define for_each_mstp_clock(mstp_clock, hw, priv) \ for (unsigned int i = 0; (priv) && i < (priv)->num_mod_clks; i++) \ if ((priv)->clks[(priv)->num_core_clks + i] == ERR_PTR(-ENOENT)) \ continue; \ else if (((hw) = __clk_get_hw((priv)->clks[(priv)->num_core_clks + i])) && \ - ((mstp_clock) = to_mod_clock(hw))) + ((mstp_clock) = to_mstp_clock(hw))) static int rzg2l_mod_clock_endisable(struct clk_hw *hw, bool enable) { - struct mstp_clock *clock = to_mod_clock(hw); + struct mstp_clock *clock = to_mstp_clock(hw); struct rzg2l_cpg_priv *priv = clock->priv; unsigned int reg = clock->off; struct device *dev = priv->dev; @@ -1251,7 +1251,7 @@ static int rzg2l_mod_clock_endisable(struct clk_hw *hw, bool enable) static int rzg2l_mod_clock_enable(struct clk_hw *hw) { - struct mstp_clock *clock = to_mod_clock(hw); + struct mstp_clock *clock = to_mstp_clock(hw); if (clock->sibling) { struct rzg2l_cpg_priv *priv = clock->priv; @@ -1271,7 +1271,7 @@ static int rzg2l_mod_clock_enable(struct clk_hw *hw) static void rzg2l_mod_clock_disable(struct clk_hw *hw) { - struct mstp_clock *clock = to_mod_clock(hw); + struct mstp_clock *clock = to_mstp_clock(hw); if (clock->sibling) { struct rzg2l_cpg_priv *priv = clock->priv; @@ -1291,7 +1291,7 @@ static void rzg2l_mod_clock_disable(struct clk_hw *hw) static int rzg2l_mod_clock_is_enabled(struct clk_hw *hw) { - struct mstp_clock *clock = to_mod_clock(hw); + struct mstp_clock *clock = to_mstp_clock(hw); struct rzg2l_cpg_priv *priv = clock->priv; u32 bitmask = BIT(clock->bit); u32 value; -- 2.43.0
