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

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
...@@ -89,7 +89,7 @@ const struct clk_ops clk_mux_ops = { ...@@ -89,7 +89,7 @@ const struct clk_ops clk_mux_ops = {
EXPORT_SYMBOL_GPL(clk_mux_ops); EXPORT_SYMBOL_GPL(clk_mux_ops);
struct clk *clk_register_mux(struct device *dev, const char *name, 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, void __iomem *reg, u8 shift, u8 width,
u8 clk_mux_flags, spinlock_t *lock) u8 clk_mux_flags, spinlock_t *lock)
{ {
......
...@@ -1328,7 +1328,7 @@ void __clk_init(struct device *dev, struct clk *clk) ...@@ -1328,7 +1328,7 @@ void __clk_init(struct device *dev, struct clk *clk)
*/ */
struct clk *clk_register(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, 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; struct clk *clk;
......
...@@ -30,7 +30,7 @@ struct clk { ...@@ -30,7 +30,7 @@ struct clk {
const struct clk_ops *ops; const struct clk_ops *ops;
struct clk_hw *hw; struct clk_hw *hw;
struct clk *parent; struct clk *parent;
char **parent_names; const char **parent_names;
struct clk **parents; struct clk **parents;
u8 num_parents; u8 num_parents;
unsigned long rate; unsigned long rate;
......
...@@ -176,7 +176,7 @@ struct clk_gate { ...@@ -176,7 +176,7 @@ struct clk_gate {
u8 bit_idx; u8 bit_idx;
u8 flags; u8 flags;
spinlock_t *lock; spinlock_t *lock;
char *parent[1]; const char *parent[1];
}; };
#define CLK_GATE_SET_TO_DISABLE BIT(0) #define CLK_GATE_SET_TO_DISABLE BIT(0)
...@@ -214,7 +214,7 @@ struct clk_divider { ...@@ -214,7 +214,7 @@ struct clk_divider {
u8 width; u8 width;
u8 flags; u8 flags;
spinlock_t *lock; spinlock_t *lock;
char *parent[1]; const char *parent[1];
}; };
#define CLK_DIVIDER_ONE_BASED BIT(0) #define CLK_DIVIDER_ONE_BASED BIT(0)
...@@ -257,7 +257,7 @@ struct clk_mux { ...@@ -257,7 +257,7 @@ struct clk_mux {
extern const struct clk_ops clk_mux_ops; extern const struct clk_ops clk_mux_ops;
struct clk *clk_register_mux(struct device *dev, const char *name, 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, void __iomem *reg, u8 shift, u8 width,
u8 clk_mux_flags, spinlock_t *lock); u8 clk_mux_flags, spinlock_t *lock);
...@@ -278,7 +278,7 @@ struct clk *clk_register_mux(struct device *dev, const char *name, ...@@ -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, struct clk *clk_register(struct device *dev, const char *name,
const struct clk_ops *ops, struct clk_hw *hw, 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 */ /* helper functions */
const char *__clk_get_name(struct clk *clk); const char *__clk_get_name(struct clk *clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment