Browse Source

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>
Masahiro Yamada 9 years ago
parent
commit
d35c80c248
1 changed files with 5 additions and 8 deletions
  1. 5 8
      drivers/clk/clk.c

+ 5 - 8
drivers/clk/clk.c

@@ -2303,25 +2303,22 @@ static inline void clk_debug_unregister(struct clk_core *core)
 #endif
 #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
  * Initializes the lists in struct clk_core, queries the hardware for the
  * parent and rate and sets them both.
  * 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;
 	int i, ret = 0;
 	struct clk_core *orphan;
 	struct clk_core *orphan;
 	struct hlist_node *tmp2;
 	struct hlist_node *tmp2;
-	struct clk_core *core;
 	unsigned long rate;
 	unsigned long rate;
 
 
-	if (!clk_user)
+	if (!core)
 		return -EINVAL;
 		return -EINVAL;
 
 
-	core = clk_user->core;
-
 	clk_prepare_lock();
 	clk_prepare_lock();
 
 
 	/* check to see if a clock with this name is already registered */
 	/* 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;
 		goto fail_parent_names_copy;
 	}
 	}
 
 
-	ret = __clk_init(hw->clk);
+	ret = __clk_init(core);
 	if (!ret)
 	if (!ret)
 		return hw->clk;
 		return hw->clk;