From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754217AbbDHNWk (ORCPT ); Wed, 8 Apr 2015 09:22:40 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:42307 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979AbbDHNWg (ORCPT ); Wed, 8 Apr 2015 09:22:36 -0400 X-AuditID: cbfec7f4-b7f106d0000013ec-42-55252aec20ad From: Krzysztof Kozlowski To: Ralf Baechle , Max Filippov , Mike Turquette , Stephen Boyd , Heiko Stuebner , Sylwester Nawrocki , Tomasz Figa , Kukjin Kim , Barry Song , Peter De Schrijver , Prashant Gaikwad , Stephen Warren , Thierry Reding , Alexandre Courbot , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/8] clk: Constify pointers to parent names in init data Date: Wed, 08 Apr 2015 15:22:14 +0200 Message-id: <1428499339-29569-4-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1428499339-29569-1-git-send-email-k.kozlowski@samsung.com> References: <1428499339-29569-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xK7pvtFRDDTY+ErR4cqiX2eLcq0cs Fv8fvWa1+PZwIaPF6xeGFv2PXzNbbHp8jdXiY889VovLu+awWXx68J/ZYsb5fUwWnV9msVk8 nXCRzWLS2qmMFjfnp1lc2qNicfhNO6vFjzPdLBavDraxWPzcNY/FYtWuP4wOoh6X+3qZPHbO usvusWlVJ5vHnWt72DyOrlzL5LF5Sb1Hb/M7No++LasYPbZfm8fs8XmTnMfGuaEB3FFcNimp OZllqUX6dglcGae2HGYq+CxX0d//l62B8YBkFyMnh4SAicScBb+ZIWwxiQv31rOB2EICSxkl tuyO7mLkArL7mCSWLHnDApJgEzCW2Lx8CRtIQkTgI6vE04MfGEESzAKGEj/f/WEHsYUFPCR+ T53CBGKzCKhKHGn6wQpi8wq4S5w8dB1qm5zEyWOTweKcQPWzlx8HGsoBtM1d4uhR5QmMvAsY GVYxiqaWJhcUJ6XnGuoVJ+YWl+al6yXn525ihMTElx2Mi49ZHWIU4GBU4uG1OKYSKsSaWFZc mXuIUYKDWUmE97+yaqgQb0piZVVqUX58UWlOavEhRiYOTqkGRo7g5X//12wPbQ2by+K+OfTr nDnxAS5zjp8+PvFW3HN9a32GhCNKvR+yIqZetTASOZH69i97rltx6zvR6RMTwuIE70U2ph/4 ZhoilnJuXY7ih0rv0qL98ut2pS6592Z+eaPju7kzTFq+7Sw9v+ksh2um1paFqb4z5U7tZjkm b79nwWcbP4FOYyWW4oxEQy3mouJEAFOoRfRnAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The 'parent_names' member of 'clk_init_data' is not modified so it can be made as an array of const pointers to constant strings. Some drivers (e.g. arch/mips/alchemy/common/clock.c) already pass such data. Signed-off-by: Krzysztof Kozlowski --- drivers/clk/clk-composite.c | 2 +- drivers/clk/clk-mux.c | 8 ++++---- include/linux/clk-provider.h | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c index 956b7e54fa1c..077f4c7148f1 100644 --- a/drivers/clk/clk-composite.c +++ b/drivers/clk/clk-composite.c @@ -188,7 +188,7 @@ static void clk_composite_disable(struct clk_hw *hw) } struct clk *clk_register_composite(struct device *dev, const char *name, - const char **parent_names, int num_parents, + const char * const *parent_names, int num_parents, struct clk_hw *mux_hw, const struct clk_ops *mux_ops, struct clk_hw *rate_hw, const struct clk_ops *rate_ops, struct clk_hw *gate_hw, const struct clk_ops *gate_ops, diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 69a094c3783d..962e2a056381 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -114,8 +114,8 @@ const struct clk_ops clk_mux_ro_ops = { EXPORT_SYMBOL_GPL(clk_mux_ro_ops); struct clk *clk_register_mux_table(struct device *dev, const char *name, - const char **parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u32 mask, + const char * const *parent_names, u8 num_parents, + unsigned long flags, void __iomem *reg, u8 shift, u32 mask, u8 clk_mux_flags, u32 *table, spinlock_t *lock) { struct clk_mux *mux; @@ -166,8 +166,8 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name, EXPORT_SYMBOL_GPL(clk_register_mux_table); struct clk *clk_register_mux(struct device *dev, const char *name, - const char **parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u8 width, + const char * const *parent_names, u8 num_parents, + unsigned long flags, void __iomem *reg, u8 shift, u8 width, u8 clk_mux_flags, spinlock_t *lock) { u32 mask = BIT(width) - 1; diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 28abf1badb40..0bf0308963da 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -209,7 +209,7 @@ struct clk_ops { struct clk_init_data { const char *name; const struct clk_ops *ops; - const char **parent_names; + const char * const *parent_names; u8 num_parents; unsigned long flags; }; @@ -426,13 +426,13 @@ extern const struct clk_ops clk_mux_ops; extern const struct clk_ops clk_mux_ro_ops; struct clk *clk_register_mux(struct device *dev, const char *name, - const char **parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u8 width, + const char * const *parent_names, u8 num_parents, + unsigned long flags, void __iomem *reg, u8 shift, u8 width, u8 clk_mux_flags, spinlock_t *lock); struct clk *clk_register_mux_table(struct device *dev, const char *name, - const char **parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u32 mask, + const char * const *parent_names, u8 num_parents, + unsigned long flags, void __iomem *reg, u8 shift, u32 mask, u8 clk_mux_flags, u32 *table, spinlock_t *lock); void clk_unregister_mux(struct clk *clk); @@ -518,7 +518,7 @@ struct clk_composite { }; struct clk *clk_register_composite(struct device *dev, const char *name, - const char **parent_names, int num_parents, + const char * const *parent_names, int num_parents, struct clk_hw *mux_hw, const struct clk_ops *mux_ops, struct clk_hw *rate_hw, const struct clk_ops *rate_ops, struct clk_hw *gate_hw, const struct clk_ops *gate_ops, -- 1.9.1