[lkml]   [2019]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH v4 2/9] clkdev: Move clk creation outside of 'clocks_mutex'
We don't need to hold the 'clocks_mutex' here when we're creating a clk
pointer from a clk_lookup structure. Instead, we just need to make sure
that the lookup doesn't go away while we dereference the lookup pointer
to extract the clk_hw pointer out of it. Let's move things around
slightly so that we have a new function to get the clk_hw out of the
lookup with the right locking and then chain the two together for what
used to be __clk_get_sys().

Cc: Miquel Raynal <>
Cc: Jerome Brunet <>
Cc: Russell King <>
Cc: Michael Turquette <>
Cc: Jeffrey Hugo <>
Cc: Chen-Yu Tsai <>
Signed-off-by: Stephen Boyd <>
drivers/clk/clkdev.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 6e787cc9e5b9..6f65bde696da 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -72,25 +72,26 @@ static struct clk_lookup *clk_find(const char *dev_id, const char *con_id)
return cl;

-static struct clk *__clk_get_sys(struct device *dev, const char *dev_id,
- const char *con_id)
+static struct clk_hw *clk_find_hw(const char *dev_id, const char *con_id)
struct clk_lookup *cl;
- struct clk *clk = NULL;
+ struct clk_hw *hw = ERR_PTR(-ENOENT);

cl = clk_find(dev_id, con_id);
- if (!cl)
- goto out;
- clk = clk_hw_create_clk(dev, cl->clk_hw, dev_id, con_id);
- if (IS_ERR(clk))
- cl = NULL;
+ if (cl)
+ hw = cl->clk_hw;

- return cl ? clk : ERR_PTR(-ENOENT);
+ return hw;
+static struct clk *__clk_get_sys(struct device *dev, const char *dev_id,
+ const char *con_id)
+ struct clk_hw *hw = clk_find_hw(dev_id, con_id);
+ return clk_hw_create_clk(dev, hw, dev_id, con_id);

struct clk *clk_get_sys(const char *dev_id, const char *con_id)
Sent by a computer through tubes
 \ /
  Last update: 2019-04-12 20:32    [W:0.471 / U:0.236 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site