summaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-12-28 19:22:56 +0900
committerStephen Boyd <sboyd@codeaurora.org>2016-02-01 17:01:32 -0800
commitd35c80c248c7a97458b075225b1bf3e41c8a6d50 (patch)
tree2ca365d97f2771396874d5ea4506b666fb40e46f /drivers/clk/clk.c
parentd9e743408ecd468974cd233623ed19253fa2a7b0 (diff)
downloadlinux-d35c80c248c7a97458b075225b1bf3e41c8a6d50.tar.bz2
clk: change the argument of __clk_init() into pointer to clk_core
The argument clk_user is used only for the clk_user->core. The rest of this function only takes care of clk_core. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/clk.c')
-rw-r--r--drivers/clk/clk.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 4bb7d09dfcf2..b8cd6bbdbbc0 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2303,25 +2303,22 @@ static inline void clk_debug_unregister(struct clk_core *core)
#endif
/**
- * __clk_init - initialize the data structures in a struct clk
- * @clk: clk being initialized
+ * __clk_init - initialize the data structures in a struct clk_core
+ * @core: clk_core being initialized
*
* Initializes the lists in struct clk_core, queries the hardware for the
* parent and rate and sets them both.
*/
-static int __clk_init(struct clk *clk_user)
+static int __clk_init(struct clk_core *core)
{
int i, ret = 0;
struct clk_core *orphan;
struct hlist_node *tmp2;
- struct clk_core *core;
unsigned long rate;
- if (!clk_user)
+ if (!core)
return -EINVAL;
- core = clk_user->core;
-
clk_prepare_lock();
/* check to see if a clock with this name is already registered */
@@ -2592,7 +2589,7 @@ struct clk *clk_register(struct device *dev, struct clk_hw *hw)
goto fail_parent_names_copy;
}
- ret = __clk_init(hw->clk);
+ ret = __clk_init(core);
if (!ret)
return hw->clk;