Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d305fb78 authored by Mark Brown's avatar Mark Brown Committed by Mike Turquette
Browse files

clk: Constify parent name arrays 



Drivers should be able to declare their arrays of parent names as const
so the APIs need to accept const arguments.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
[mturquette@linaro.org: constified gate]
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 7e87aed9

drivers/clk/clk-mux.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ const struct clk_ops clk_mux_ops = { 
EXPORT_SYMBOL_GPL(clk_mux_ops);



struct clk *clk_register_mux(struct device *dev, const char *name,

		char **parent_names, u8 num_parents, unsigned long flags,

		const char **parent_names, u8 num_parents, unsigned long flags,

		void __iomem *reg, u8 shift, u8 width,

		u8 clk_mux_flags, spinlock_t *lock)

{

drivers/clk/clk.c

+1 −1
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ void __clk_init(struct device *dev, struct clk *clk) 
 */

struct clk *clk_register(struct device *dev, const char *name,

		const struct clk_ops *ops, struct clk_hw *hw,

		char **parent_names, u8 num_parents, unsigned long flags)

		const char **parent_names, u8 num_parents, unsigned long flags)

{

	struct clk *clk;

include/linux/clk-private.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct clk { 
	const struct clk_ops	*ops;

	struct clk_hw		*hw;

	struct clk		*parent;

	char			**parent_names;

	const char		**parent_names;

	struct clk		**parents;

	u8			num_parents;

	unsigned long		rate;

include/linux/clk-provider.h

+4 −4
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct clk_gate { 
	u8		bit_idx;

	u8		flags;

	spinlock_t	*lock;

	char		*parent[1];

	const char	*parent[1];

};



#define CLK_GATE_SET_TO_DISABLE		BIT(0)
@@ -214,7 +214,7 @@ struct clk_divider { 
	u8		width;

	u8		flags;

	spinlock_t	*lock;

	char		*parent[1];

	const char	*parent[1];

};



#define CLK_DIVIDER_ONE_BASED		BIT(0)
@@ -257,7 +257,7 @@ struct clk_mux { 


extern const struct clk_ops clk_mux_ops;

struct clk *clk_register_mux(struct device *dev, const char *name,

		char **parent_names, u8 num_parents, unsigned long flags,

		const char **parent_names, u8 num_parents, unsigned long flags,

		void __iomem *reg, u8 shift, u8 width,

		u8 clk_mux_flags, spinlock_t *lock);
@@ -278,7 +278,7 @@ struct clk *clk_register_mux(struct device *dev, const char *name, 
 */

struct clk *clk_register(struct device *dev, const char *name,

		const struct clk_ops *ops, struct clk_hw *hw,

		char **parent_names, u8 num_parents, unsigned long flags);

		const char **parent_names, u8 num_parents, unsigned long flags);



/* helper functions */

const char *__clk_get_name(struct clk *clk);