summaryrefslogtreecommitdiff
path: root/drivers/clk/clk.c
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@baylibre.com>2016-06-17 08:07:08 +0300
committerMichael Turquette <mturquette@baylibre.com>2016-06-17 08:07:08 +0300
commit071a0cb66cc6d355f70e5c3aa701033f22ac7476 (patch)
treeed4a9ec0e7d4fa4666967587db0ede019d625a7c /drivers/clk/clk.c
parent72ad679aa7182d23d269cbe4d655f7e129d3b057 (diff)
parentf17a0dd1c2e0d05c38589c9a13a36db455b74818 (diff)
downloadlinux-071a0cb66cc6d355f70e5c3aa701033f22ac7476.tar.xz
Merge commit 'f17a0dd1c2e0' into clk-next
Diffstat (limited to 'drivers/clk/clk.c')
-rw-r--r--drivers/clk/clk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index d584004f7af7..874c7dd8ef66 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -688,12 +688,12 @@ static void clk_core_disable(struct clk_core *core)
if (--core->enable_count > 0)
return;
- trace_clk_disable(core);
+ trace_clk_disable_rcuidle(core);
if (core->ops->disable)
core->ops->disable(core->hw);
- trace_clk_disable_complete(core);
+ trace_clk_disable_complete_rcuidle(core);
clk_core_disable(core->parent);
}
@@ -741,12 +741,12 @@ static int clk_core_enable(struct clk_core *core)
if (ret)
return ret;
- trace_clk_enable(core);
+ trace_clk_enable_rcuidle(core);
if (core->ops->enable)
ret = core->ops->enable(core->hw);
- trace_clk_enable_complete(core);
+ trace_clk_enable_complete_rcuidle(core);
if (ret) {
clk_core_disable(core->parent);