Commit 2893c379 authored by Sascha Hauer's avatar Sascha Hauer Committed by Stephen Boyd
Browse files

clk: make strings in parent name arrays const 



The clk functions and structs declare the parent_name arrays as
'const char **parent_names' which means the parent name strings
are const, but the array itself is not. Use
'const char * const * parent_names' instead which also makes
the array const. This allows us to put the parent_name arrays into
the __initconst section.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Tested-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
[sboyd@codeaurora.org: Squelch 80-character checkpatch warnings]
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 396e339a

drivers/clk/clk-composite.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/clk/clk-mux.c

+4 −2
Original line number Diff line number Diff line
@@ -114,7 +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,

		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)

{
@@ -166,7 +167,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,

		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)

{

include/linux/clk-provider.h

+6 −4
Original line number Diff line number Diff line
@@ -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,12 +426,14 @@ 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,

		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,

		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);
@@ -518,7 +520,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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE