3 files changed, 59 insertions, 37 deletions

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 113456030d66..5469d7714f5d 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2382,7 +2382,7 @@ struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
         return clk;
 }
 
-static void __clk_free_clk(struct clk *clk)
+void __clk_free_clk(struct clk *clk)
 {
         clk_prepare_lock();
         hlist_del(&clk->child_node);
@@ -2894,7 +2894,8 @@ void of_clk_del_provider(struct device_node *np)
 }
 EXPORT_SYMBOL_GPL(of_clk_del_provider);
 
-struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec)
+struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec,
+                                       const char *dev_id, const char *con_id)
 {
         struct of_clk_provider *provider;
         struct clk *clk = ERR_PTR(-EPROBE_DEFER);
@@ -2903,8 +2904,17 @@ struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec)
         list_for_each_entry(provider, &of_clk_providers, link) {
                 if (provider->node == clkspec->np)
                         clk = provider->get(clkspec, provider->data);
-                if (!IS_ERR(clk))
+                if (!IS_ERR(clk)) {
+                        clk = __clk_create_clk(__clk_get_hw(clk), dev_id,
+                                               con_id);
+
+                        if (!IS_ERR(clk) && !__clk_get(clk)) {
+                                __clk_free_clk(clk);
+                                clk = ERR_PTR(-ENOENT);
+                        }
+
                         break;
+                }
         }
 
         return clk;
@@ -2915,7 +2925,7 @@ struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
         struct clk *clk;
 
         mutex_lock(&of_clk_mutex);
-        clk = __of_clk_get_from_provider(clkspec);
+        clk = __of_clk_get_from_provider(clkspec, NULL, __func__);
         mutex_unlock(&of_clk_mutex);
 
         return clk;
diff --git a/drivers/clk/clk.h b/drivers/clk/clk.h
index 23c44e51df69..ba845408cc3e 100644
--- a/drivers/clk/clk.h
+++ b/drivers/clk/clk.h
@@ -13,10 +13,27 @@ struct clk_hw;
 
 #if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK)
 struct clk *of_clk_get_by_clkspec(struct of_phandle_args *clkspec);
-struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec);
+struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec,
+                                       const char *dev_id, const char *con_id);
 void of_clk_lock(void);
 void of_clk_unlock(void);
 #endif
 
+#ifdef CONFIG_COMMON_CLK
 struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
                              const char *con_id);
+void __clk_free_clk(struct clk *clk);
+#else
+/* All these casts to avoid ifdefs in clkdev... */
+static inline struct clk *
+__clk_create_clk(struct clk_hw *hw, const char *dev_id, const char *con_id)
+{
+        return (struct clk *)hw;
+}
+static inline void __clk_free_clk(struct clk *clk) { }
+static struct clk_hw *__clk_get_hw(struct clk *clk)
+{
+        return (struct clk_hw *)clk;
+}
+
+#endif
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 29a1ab7af4b8..043fd3633373 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -29,6 +29,20 @@ static DEFINE_MUTEX(clocks_mutex);
 
 #if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK)
 
+static struct clk *__of_clk_get_by_clkspec(struct of_phandle_args *clkspec,
+                                         const char *dev_id, const char *con_id)
+{
+        struct clk *clk;
+
+        if (!clkspec)
+                return ERR_PTR(-EINVAL);
+
+        of_clk_lock();
+        clk = __of_clk_get_from_provider(clkspec, dev_id, con_id);
+        of_clk_unlock();
+        return clk;
+}
+
 /**
  * of_clk_get_by_clkspec() - Lookup a clock form a clock provider
  * @clkspec: pointer to a clock specifier data structure
@@ -39,22 +53,11 @@ static DEFINE_MUTEX(clocks_mutex);
  */
 struct clk *of_clk_get_by_clkspec(struct of_phandle_args *clkspec)
 {
-        struct clk *clk;
-
-        if (!clkspec)
-                return ERR_PTR(-EINVAL);
-
-        of_clk_lock();
-        clk = __of_clk_get_from_provider(clkspec);
-
-        if (!IS_ERR(clk) && !__clk_get(clk))
-                clk = ERR_PTR(-ENOENT);
-
-        of_clk_unlock();
-        return clk;
+        return __of_clk_get_by_clkspec(clkspec, NULL, __func__);
 }
 
-static struct clk *__of_clk_get(struct device_node *np, int index)
+static struct clk *__of_clk_get(struct device_node *np, int index,
+                               const char *dev_id, const char *con_id)
 {
         struct of_phandle_args clkspec;
         struct clk *clk;
@@ -68,7 +71,7 @@ static struct clk *__of_clk_get(struct device_node *np, int index)
         if (rc)
                 return ERR_PTR(rc);
 
-        clk = of_clk_get_by_clkspec(&clkspec);
+        clk = __of_clk_get_by_clkspec(&clkspec, dev_id, con_id);
         of_node_put(clkspec.np);
 
         return clk;
@@ -76,12 +79,7 @@ static struct clk *__of_clk_get(struct device_node *np, int index)
 
 struct clk *of_clk_get(struct device_node *np, int index)
 {
-        struct clk *clk = __of_clk_get(np, index);
-
-        if (!IS_ERR(clk))
-                clk = __clk_create_clk(__clk_get_hw(clk), np->full_name, NULL);
-
-        return clk;
+        return __of_clk_get(np, index, np->full_name, NULL);
 }
 EXPORT_SYMBOL(of_clk_get);
 
@@ -102,12 +100,10 @@ static struct clk *__of_clk_get_by_name(struct device_node *np,
                  */
                 if (name)
                         index = of_property_match_string(np, "clock-names", name);
-                clk = __of_clk_get(np, index);
+                clk = __of_clk_get(np, index, dev_id, name);
                 if (!IS_ERR(clk)) {
-                        clk = __clk_create_clk(__clk_get_hw(clk), dev_id, name);
                         break;
-                }
-                else if (name && index >= 0) {
+                } else if (name && index >= 0) {
                         if (PTR_ERR(clk) != -EPROBE_DEFER)
                                 pr_err("ERROR: could not get clock %s:%s(%i)\n",
                                         np->full_name, name ? name : "", index);
@@ -209,17 +205,16 @@ struct clk *clk_get_sys(const char *dev_id, const char *con_id)
         if (!cl)
                 goto out;
 
-        if (!__clk_get(cl->clk)) {
+        clk = __clk_create_clk(__clk_get_hw(cl->clk), dev_id, con_id);
+        if (IS_ERR(clk))
+                goto out;
+
+        if (!__clk_get(clk)) {
+                __clk_free_clk(clk);
                 cl = NULL;
                 goto out;
         }
 
-#if defined(CONFIG_COMMON_CLK)
-        clk = __clk_create_clk(__clk_get_hw(cl->clk), dev_id, con_id);
-#else
-        clk = cl->clk;
-#endif
-
 out:
         mutex_unlock(&clocks_mutex);