Merge branches 'clk-optional', 'clk-devm-clkdev-register', 'clk-allwinner', 'clk...

[linux-2.6-microblaze.git] / drivers / clk / clkdev.c

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 9ab3db8..4cfe396 100644 (file)
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -52,6 +52,12 @@ struct clk *of_clk_get(struct device_node *np, int index)
 }
 EXPORT_SYMBOL(of_clk_get);
 
+/*
+ * Beware the return values when np is valid, but no clock provider is found.
+ * If name == NULL, the function returns -ENOENT.
+ * If name != NULL, the function returns -EINVAL. This is because __of_clk_get()
+ * is called even if of_property_match_string() returns an error.
+ */
 static struct clk *__of_clk_get_by_name(struct device_node *np,
                                        const char *dev_id,
                                        const char *name)
@@ -401,6 +407,23 @@ static struct clk_lookup *__clk_register_clkdev(struct clk_hw *hw,
        return cl;
 }
 
+static int do_clk_register_clkdev(struct clk_hw *hw,
+       struct clk_lookup **cl, const char *con_id, const char *dev_id)
+{
+       if (IS_ERR(hw))
+               return PTR_ERR(hw);
+       /*
+        * Since dev_id can be NULL, and NULL is handled specially, we must
+        * pass it as either a NULL format string, or with "%s".
+        */
+       if (dev_id)
+               *cl = __clk_register_clkdev(hw, con_id, "%s", dev_id);
+       else
+               *cl = __clk_register_clkdev(hw, con_id, NULL);
+
+       return *cl ? 0 : -ENOMEM;
+}
+
 /**
  * clk_register_clkdev - register one clock lookup for a struct clk
  * @clk: struct clk to associate with all clk_lookups
@@ -423,17 +446,8 @@ int clk_register_clkdev(struct clk *clk, const char *con_id,
        if (IS_ERR(clk))
                return PTR_ERR(clk);
 
-       /*
-        * Since dev_id can be NULL, and NULL is handled specially, we must
-        * pass it as either a NULL format string, or with "%s".
-        */
-       if (dev_id)
-               cl = __clk_register_clkdev(__clk_get_hw(clk), con_id, "%s",
-                                          dev_id);
-       else
-               cl = __clk_register_clkdev(__clk_get_hw(clk), con_id, NULL);
-
-       return cl ? 0 : -ENOMEM;
+       return do_clk_register_clkdev(__clk_get_hw(clk), &cl, con_id,
+                                             dev_id);
 }
 EXPORT_SYMBOL(clk_register_clkdev);
 
@@ -456,18 +470,75 @@ int clk_hw_register_clkdev(struct clk_hw *hw, const char *con_id,
 {
        struct clk_lookup *cl;
 
-       if (IS_ERR(hw))
-               return PTR_ERR(hw);
+       return do_clk_register_clkdev(hw, &cl, con_id, dev_id);
+}
+EXPORT_SYMBOL(clk_hw_register_clkdev);
 
-       /*
-        * Since dev_id can be NULL, and NULL is handled specially, we must
-        * pass it as either a NULL format string, or with "%s".
-        */
-       if (dev_id)
-               cl = __clk_register_clkdev(hw, con_id, "%s", dev_id);
-       else
-               cl = __clk_register_clkdev(hw, con_id, NULL);
+static void devm_clkdev_release(struct device *dev, void *res)
+{
+       clkdev_drop(*(struct clk_lookup **)res);
+}
+
+static int devm_clk_match_clkdev(struct device *dev, void *res, void *data)
+{
+       struct clk_lookup **l = res;
 
-       return cl ? 0 : -ENOMEM;
+       return *l == data;
 }
-EXPORT_SYMBOL(clk_hw_register_clkdev);
+
+/**
+ * devm_clk_release_clkdev - Resource managed clkdev lookup release
+ * @dev: device this lookup is bound
+ * @con_id: connection ID string on device
+ * @dev_id: format string describing device name
+ *
+ * Drop the clkdev lookup created with devm_clk_hw_register_clkdev.
+ * Normally this function will not need to be called and the resource
+ * management code will ensure that the resource is freed.
+ */
+void devm_clk_release_clkdev(struct device *dev, const char *con_id,
+                            const char *dev_id)
+{
+       struct clk_lookup *cl;
+       int rval;
+
+       cl = clk_find(dev_id, con_id);
+       WARN_ON(!cl);
+       rval = devres_release(dev, devm_clkdev_release,
+                             devm_clk_match_clkdev, cl);
+       WARN_ON(rval);
+}
+EXPORT_SYMBOL(devm_clk_release_clkdev);
+
+/**
+ * devm_clk_hw_register_clkdev - managed clk lookup registration for clk_hw
+ * @dev: device this lookup is bound
+ * @hw: struct clk_hw to associate with all clk_lookups
+ * @con_id: connection ID string on device
+ * @dev_id: format string describing device name
+ *
+ * con_id or dev_id may be NULL as a wildcard, just as in the rest of
+ * clkdev.
+ *
+ * To make things easier for mass registration, we detect error clk_hws
+ * from a previous clk_hw_register_*() call, and return the error code for
+ * those.  This is to permit this function to be called immediately
+ * after clk_hw_register_*().
+ */
+int devm_clk_hw_register_clkdev(struct device *dev, struct clk_hw *hw,
+                               const char *con_id, const char *dev_id)
+{
+       int rval = -ENOMEM;
+       struct clk_lookup **cl;
+
+       cl = devres_alloc(devm_clkdev_release, sizeof(*cl), GFP_KERNEL);
+       if (cl) {
+               rval = do_clk_register_clkdev(hw, cl, con_id, dev_id);
+               if (!rval)
+                       devres_add(dev, cl);
+               else
+                       devres_free(cl);
+       }
+       return rval;
+}
+EXPORT_SYMBOL(devm_clk_hw_register_clkdev);