diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-21 16:01:20 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2012-04-24 19:37:39 -0400 |
commit | d305fb78f31209596c9135d396a0d3af7ac86947 (patch) | |
tree | 456b810cdd4c3081b465a387fb04a31fb9fce399 /include/linux/clk-provider.h | |
parent | 7e87aed965fa7a642fc299af96d370dad7b5b814 (diff) |
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
[mturquette@linaro.org: constified gate]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'include/linux/clk-provider.h')
-rw-r--r-- | include/linux/clk-provider.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 6eb8e5da788e..8981435f9064 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h | |||
@@ -176,7 +176,7 @@ struct clk_gate { | |||
176 | u8 bit_idx; | 176 | u8 bit_idx; |
177 | u8 flags; | 177 | u8 flags; |
178 | spinlock_t *lock; | 178 | spinlock_t *lock; |
179 | char *parent[1]; | 179 | const char *parent[1]; |
180 | }; | 180 | }; |
181 | 181 | ||
182 | #define CLK_GATE_SET_TO_DISABLE BIT(0) | 182 | #define CLK_GATE_SET_TO_DISABLE BIT(0) |
@@ -214,7 +214,7 @@ struct clk_divider { | |||
214 | u8 width; | 214 | u8 width; |
215 | u8 flags; | 215 | u8 flags; |
216 | spinlock_t *lock; | 216 | spinlock_t *lock; |
217 | char *parent[1]; | 217 | const char *parent[1]; |
218 | }; | 218 | }; |
219 | 219 | ||
220 | #define CLK_DIVIDER_ONE_BASED BIT(0) | 220 | #define CLK_DIVIDER_ONE_BASED BIT(0) |
@@ -257,7 +257,7 @@ struct clk_mux { | |||
257 | 257 | ||
258 | extern const struct clk_ops clk_mux_ops; | 258 | extern const struct clk_ops clk_mux_ops; |
259 | struct clk *clk_register_mux(struct device *dev, const char *name, | 259 | struct clk *clk_register_mux(struct device *dev, const char *name, |
260 | char **parent_names, u8 num_parents, unsigned long flags, | 260 | const char **parent_names, u8 num_parents, unsigned long flags, |
261 | void __iomem *reg, u8 shift, u8 width, | 261 | void __iomem *reg, u8 shift, u8 width, |
262 | u8 clk_mux_flags, spinlock_t *lock); | 262 | u8 clk_mux_flags, spinlock_t *lock); |
263 | 263 | ||
@@ -278,7 +278,7 @@ struct clk *clk_register_mux(struct device *dev, const char *name, | |||
278 | */ | 278 | */ |
279 | struct clk *clk_register(struct device *dev, const char *name, | 279 | struct clk *clk_register(struct device *dev, const char *name, |
280 | const struct clk_ops *ops, struct clk_hw *hw, | 280 | const struct clk_ops *ops, struct clk_hw *hw, |
281 | char **parent_names, u8 num_parents, unsigned long flags); | 281 | const char **parent_names, u8 num_parents, unsigned long flags); |
282 | 282 | ||
283 | /* helper functions */ | 283 | /* helper functions */ |
284 | const char *__clk_get_name(struct clk *clk); | 284 | const char *__clk_get_name(struct clk *clk); |