[V3,2/3] clk: add managed version of clk_bulk_get

Commit Message

Aisheng Dong May 19, 2017, 1:49 p.m. UTC

This patch introduces the managed version of clk_bulk_get.

Cc: Michael Turquette <[e-mail]>
Cc: Stephen Boyd <[e-mail]>
Cc: Russell King <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Cc: "Rafael J. Wysocki" <[e-mail]>
Cc: Viresh Kumar <[e-mail]>
Cc: Mark Brown <[e-mail]>
Cc: Shawn Guo <[e-mail]>
Cc: Fabio Estevam <[e-mail]>
Cc: Sascha Hauer <[e-mail]>
Cc: Anson Huang <[e-mail]>
Cc: Robin Gong <[e-mail]>
Cc: Bai Ping <[e-mail]>
Cc: Leonard Crestez <[e-mail]>
Cc: Octavian Purdila <[e-mail]>
Signed-off-by: Dong Aisheng <[e-mail]>
---
ChangeLog:
v2->v3: no changes
v1->v2: only one minor comment change
---
 drivers/clk/clk-devres.c | 36 ++++++++++++++++++++++++++++++++++++
 include/linux/clk.h      | 21 +++++++++++++++++++++
 2 files changed, 57 insertions(+)

Comments

Stephen Boyd June 2, 2017, 10:39 p.m. UTC | #1

On 05/19, Dong Aisheng wrote:
> This patch introduces the managed version of clk_bulk_get.
> 
> Cc: Michael Turquette <[e-mail]>
> Cc: Stephen Boyd <[e-mail]>
> Cc: Russell King <[e-mail]>
> Cc: Geert Uytterhoeven <[e-mail]>
> Cc: "Rafael J. Wysocki" <[e-mail]>
> Cc: Viresh Kumar <[e-mail]>
> Cc: Mark Brown <[e-mail]>
> Cc: Shawn Guo <[e-mail]>
> Cc: Fabio Estevam <[e-mail]>
> Cc: Sascha Hauer <[e-mail]>
> Cc: Anson Huang <[e-mail]>
> Cc: Robin Gong <[e-mail]>
> Cc: Bai Ping <[e-mail]>
> Cc: Leonard Crestez <[e-mail]>
> Cc: Octavian Purdila <[e-mail]>
> Signed-off-by: Dong Aisheng <[e-mail]>
> ---

Applied to clk-bulk-get and merged into clk-next.

Patch

diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c
index 3a218c3..d854e26 100644
--- a/drivers/clk/clk-devres.c
+++ b/drivers/clk/clk-devres.c
@@ -34,6 +34,42 @@  struct clk *devm_clk_get(struct device *dev, const char *id)
 }
 EXPORT_SYMBOL(devm_clk_get);
 
+struct clk_bulk_devres {
+	struct clk_bulk_data *clks;
+	int num_clks;
+};
+
+static void devm_clk_bulk_release(struct device *dev, void *res)
+{
+	struct clk_bulk_devres *devres = res;
+
+	clk_bulk_put(devres->num_clks, devres->clks);
+}
+
+int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
+		      struct clk_bulk_data *clks)
+{
+	struct clk_bulk_devres *devres;
+	int ret;
+
+	devres = devres_alloc(devm_clk_bulk_release,
+			      sizeof(*devres), GFP_KERNEL);
+	if (!devres)
+		return -ENOMEM;
+
+	ret = clk_bulk_get(dev, num_clks, clks);
+	if (!ret) {
+		devres->clks = clks;
+		devres->num_clks = num_clks;
+		devres_add(dev, devres);
+	} else {
+		devres_free(devres);
+	}
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(devm_clk_bulk_get);
+
 static int devm_clk_match(struct device *dev, void *res, void *data)
 {
 	struct clk **c = res;
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 1201944..1ebccf3 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -281,6 +281,21 @@  int __must_check clk_bulk_get(struct device *dev, int num_clks,
 			      struct clk_bulk_data *clks);
 
 /**
+ * devm_clk_bulk_get - managed get multiple clk consumers
+ * @dev: device for clock "consumer"
+ * @num_clks: the number of clk_bulk_data
+ * @clks: the clk_bulk_data table of consumer
+ *
+ * Return 0 on success, an errno on failure.
+ *
+ * This helper function allows drivers to get several clk
+ * consumers in one operation with management, the clks will
+ * automatically be freed when the device is unbound.
+ */
+int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
+				   struct clk_bulk_data *clks);
+
+/**
  * devm_clk_get - lookup and obtain a managed reference to a clock producer.
  * @dev: device for clock "consumer"
  * @id: clock consumer ID
@@ -550,6 +565,12 @@  static inline struct clk *devm_clk_get(struct device *dev, const char *id)
 	return NULL;
 }
 
+static inline int devm_clk_bulk_get(struct device *dev, int num_clks,
+				    struct clk_bulk_data *clks)
+{
+	return 0;
+}
+
 static inline struct clk *devm_get_clk_from_child(struct device *dev,
 				struct device_node *np, const char *con_id)
 {