| Message ID | 20170620151855.19399-1-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 06/20, Paul Cercueil wrote: > The CGU common code does not modify the pointed clk_ops structure, so it > should be marked as const. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- How did you want to merge this series? I can ack clk patches if you like, or apply the clk patches to the clk tree.
Hi, Le 2017-06-21 23:50, Stephen Boyd a écrit : > On 06/20, Paul Cercueil wrote: >> The CGU common code does not modify the pointed clk_ops structure, so >> it >> should be marked as const. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> --- > > How did you want to merge this series? I can ack clk patches if > you like, or apply the clk patches to the clk tree. The clk patches refer to CONFIG_MACH_JZ4770 in the Kconfig, so they indirectly depend on the other patches. I think it's better that you ack them then. -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/ingenic/cgu.h b/drivers/clk/ingenic/cgu.h index 09700b2c555d..da448b0cac18 100644 --- a/drivers/clk/ingenic/cgu.h +++ b/drivers/clk/ingenic/cgu.h @@ -120,7 +120,7 @@ struct ingenic_cgu_gate_info { * @clk_ops: custom clock operation callbacks */ struct ingenic_cgu_custom_info { - struct clk_ops *clk_ops; + const struct clk_ops *clk_ops; }; /** diff --git a/drivers/clk/ingenic/jz4780-cgu.c b/drivers/clk/ingenic/jz4780-cgu.c index b35d6d9dd5aa..a21698fb202c 100644 --- a/drivers/clk/ingenic/jz4780-cgu.c +++ b/drivers/clk/ingenic/jz4780-cgu.c @@ -203,7 +203,7 @@ static int jz4780_otg_phy_set_rate(struct clk_hw *hw, unsigned long req_rate, return 0; } -static struct clk_ops jz4780_otg_phy_ops = { +static const struct clk_ops jz4780_otg_phy_ops = { .get_parent = jz4780_otg_phy_get_parent, .set_parent = jz4780_otg_phy_set_parent,
The CGU common code does not modify the pointed clk_ops structure, so it should be marked as const. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/clk/ingenic/cgu.h | 2 +- drivers/clk/ingenic/jz4780-cgu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) v2: New patch in this series