summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-10-01 21:05:09 +0200
committerHeiko Stuebner <heiko@sntech.de>2015-10-06 09:46:24 +0200
commit772b05086d7ade59e997c4f5f2cca6af16f5096d (patch)
tree6b963e5c6ca8d3e11d634a8917e19198d358e8ba /drivers/base
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
downloadblackbird-op-linux-772b05086d7ade59e997c4f5f2cca6af16f5096d.tar.gz
blackbird-op-linux-772b05086d7ade59e997c4f5f2cca6af16f5096d.zip
PM / clk: Do not __clk_get passed in clock-references
Clock references are on a per-user basis now, so they are not supposed to be refcounted by itself anymore. Therefore multiple cascaded get and put calls will fail. When a clock reference gets passed into pm_clk_add_clk we can assume that the pm clock handling will take control of the clock reference, so after this functions returns the caller should've given up control of that handle. So remove the additional call to __clk_get() in __pm_clk_add(). The only current user of pm_clk_add_clk is drivers/clk/shmobile/clk-mstp.c which already follows this paradigm by only getting the clock but not puting it after passing the reference into pm_clk_add_clk. In the error case the caller is expected to clean up the clock, as it may very well try to do something different if pm_clk_add_clk() fails. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> [add commit-message] Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/clock_ops.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 652b5a367c1f..6ce76934057f 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -93,7 +93,7 @@ static int __pm_clk_add(struct device *dev, const char *con_id,
return -ENOMEM;
}
} else {
- if (IS_ERR(clk) || !__clk_get(clk)) {
+ if (IS_ERR(clk)) {
kfree(ce);
return -ENOENT;
}
@@ -127,7 +127,9 @@ int pm_clk_add(struct device *dev, const char *con_id)
* @clk: Clock pointer
*
* Add the clock to the list of clocks used for the power management of @dev.
- * It will increment refcount on clock pointer, use clk_put() on it when done.
+ * The power-management code will take control of the clock reference, so
+ * callers should not call clk_put() on @clk after this function sucessfully
+ * returned.
*/
int pm_clk_add_clk(struct device *dev, struct clk *clk)
{
OpenPOWER on IntegriCloud