UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: gpio: Mark parent_names array const 

Let's encourage const arrays of parent names like other basic
clock types.

Cc: Sergej Sawazki <ce3a@gmx.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Stephen Boyd 2015-07-24 09:31:29 -07:00
parent 1db92e54f5
commit 37bff2c159
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/clk/clk-gpio.c
View File

@ -95,7 +95,7 @@ const struct clk_ops clk_gpio_mux_ops = {
EXPORT_SYMBOL_GPL(clk_gpio_mux_ops); EXPORT_SYMBOL_GPL(clk_gpio_mux_ops);
static struct clk *clk_register_gpio(struct device *dev, const char *name, static struct clk *clk_register_gpio(struct device *dev, const char *name,
const char **parent_names, u8 num_parents, unsigned gpio, const char * const *parent_names, u8 num_parents, unsigned gpio,
bool active_low, unsigned long flags, bool active_low, unsigned long flags,
const struct clk_ops *clk_gpio_ops) const struct clk_ops *clk_gpio_ops)
{ {
@ -188,7 +188,7 @@ EXPORT_SYMBOL_GPL(clk_register_gpio_gate);
* @flags: clock flags * @flags: clock flags
*/ */
struct clk *clk_register_gpio_mux(struct device *dev, const char *name, struct clk *clk_register_gpio_mux(struct device *dev, const char *name,
const char **parent_names, u8 num_parents, unsigned gpio, const char * const *parent_names, u8 num_parents, unsigned gpio,
bool active_low, unsigned long flags) bool active_low, unsigned long flags)
{ {
if (num_parents != 2) { if (num_parents != 2) {
@ -213,7 +213,7 @@ struct clk_gpio_delayed_register_data {
struct mutex lock; struct mutex lock;
struct clk *clk; struct clk *clk;
struct clk *(*clk_register_get)(const char *name, struct clk *(*clk_register_get)(const char *name,
const char **parent_names, u8 num_parents, const char * const *parent_names, u8 num_parents,
unsigned gpio, bool active_low); unsigned gpio, bool active_low);
}; };
@ -273,7 +273,7 @@ out:
} }
static struct clk *of_clk_gpio_gate_delayed_register_get(const char *name, static struct clk *of_clk_gpio_gate_delayed_register_get(const char *name,
const char **parent_names, u8 num_parents, const char * const *parent_names, u8 num_parents,
unsigned gpio, bool active_low) unsigned gpio, bool active_low)
{ {
return clk_register_gpio_gate(NULL, name, parent_names[0], return clk_register_gpio_gate(NULL, name, parent_names[0],
@ -281,7 +281,7 @@ static struct clk *of_clk_gpio_gate_delayed_register_get(const char *name,
} }
static struct clk *of_clk_gpio_mux_delayed_register_get(const char *name, static struct clk *of_clk_gpio_mux_delayed_register_get(const char *name,
const char **parent_names, u8 num_parents, unsigned gpio, const char * const *parent_names, u8 num_parents, unsigned gpio,
bool active_low) bool active_low)
{ {
return clk_register_gpio_mux(NULL, name, parent_names, num_parents, return clk_register_gpio_mux(NULL, name, parent_names, num_parents,
@ -291,7 +291,8 @@ static struct clk *of_clk_gpio_mux_delayed_register_get(const char *name,
static void __init of_gpio_clk_setup(struct device_node *node, static void __init of_gpio_clk_setup(struct device_node *node,
const char *gpio_name, const char *gpio_name,
struct clk *(*clk_register_get)(const char *name, struct clk *(*clk_register_get)(const char *name,
const char **parent_names, u8 num_parents, const char * const *parent_names,
u8 num_parents,
unsigned gpio, bool active_low)) unsigned gpio, bool active_low))
{ {
struct clk_gpio_delayed_register_data *data; struct clk_gpio_delayed_register_data *data;

2
include/linux/clk-provider.h
View File

@ -583,7 +583,7 @@ void of_gpio_clk_gate_setup(struct device_node *node);
extern const struct clk_ops clk_gpio_mux_ops; extern const struct clk_ops clk_gpio_mux_ops;
struct clk *clk_register_gpio_mux(struct device *dev, const char *name, struct clk *clk_register_gpio_mux(struct device *dev, const char *name,
const char **parent_names, u8 num_parents, unsigned gpio, const char * const *parent_names, u8 num_parents, unsigned gpio,
bool active_low, unsigned long flags); bool active_low, unsigned long flags);
void of_gpio_mux_clk_setup(struct device_node *node); void of_gpio_mux_clk_setup(struct device_node *node);