[PATCH] [RFC] devm: drop devm_clk_put
From: Uwe Kleine-König <hidden>
Date: 2013-09-24 19:20:43
Also in:
lkml
Subsystem:
clk api, common clk framework, documentation, the rest · Maintainers:
Russell King, Michael Turquette, Stephen Boyd, Jonathan Corbet, Linus Torvalds
devm_clk_put isn't really necessary as a driver usually keeps the reference during its lifetime and there are no in-tree users. So drop it. Signed-off-by: Uwe Kleine-K?nig <redacted> --- The "no in-tree users" part of the commit log isn't true yet, as there is no agreed-on patch for sound/soc/kirkwood/kirkwood-i2s.c yet and the other patches in this thread are not applied/acked yet. --- Documentation/driver-model/devres.txt | 1 - drivers/clk/clk-devres.c | 10 ---------- include/linux/clk.h | 19 +++---------------- 3 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 5bdc8cb..9d04836 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt@@ -287,7 +287,6 @@ REGULATOR CLOCK devm_clk_get() - devm_clk_put() PINCTRL devm_pinctrl_get()
diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c
index 8f57154..0943d8f 100644
--- a/drivers/clk/clk-devres.c
+++ b/drivers/clk/clk-devres.c@@ -43,13 +43,3 @@ static int devm_clk_match(struct device *dev, void *res, void *data) } return *c == data; } - -void devm_clk_put(struct device *dev, struct clk *clk) -{ - int ret; - - ret = devres_release(dev, devm_clk_release, devm_clk_match, clk); - - WARN_ON(ret); -} -EXPORT_SYMBOL(devm_clk_put);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 9a6d045..5115bc6 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h@@ -154,7 +154,9 @@ struct clk *clk_get(struct device *dev, const char *id); * devm_clk_get should not be called from within interrupt context. * * The clock will automatically be freed when the device is unbound - * from the bus. + * from the bus. Note there is deliberately no devm_clk_put function as a + * driver usally keeps the reference to its clocks during the complete driver + * live time. */ struct clk *devm_clk_get(struct device *dev, const char *id);
@@ -205,19 +207,6 @@ unsigned long clk_get_rate(struct clk *clk); */ void clk_put(struct clk *clk); -/** - * devm_clk_put - "free" a managed clock source - * @dev: device used to acuqire the clock - * @clk: clock source acquired with devm_clk_get() - * - * Note: drivers must ensure that all clk_enable calls made on this - * clock source are balanced by clk_disable calls prior to calling - * this function. - * - * clk_put should not be called from within interrupt context. - */ -void devm_clk_put(struct device *dev, struct clk *clk); - /* * The remaining APIs are optional for machine class support. */
@@ -290,8 +279,6 @@ static inline struct clk *devm_clk_get(struct device *dev, const char *id) static inline void clk_put(struct clk *clk) {} -static inline void devm_clk_put(struct device *dev, struct clk *clk) {} - static inline int clk_enable(struct clk *clk) { return 0;
--
1.8.4.rc3