Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[sfrench/cifs-2.6.git] / drivers / clk / clk.c

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 496b86e2753c2669ed65a830011cd93b730bcbf4..ae07685c7588b0bef2136ff4f00f5904af3fa906 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1066,12 +1066,12 @@ static void clk_core_disable(struct clk_core *core)
        if (--core->enable_count > 0)
                return;
 
-       trace_clk_disable_rcuidle(core);
+       trace_clk_disable(core);
 
        if (core->ops->disable)
                core->ops->disable(core->hw);
 
-       trace_clk_disable_complete_rcuidle(core);
+       trace_clk_disable_complete(core);
 
        clk_core_disable(core->parent);
 }
@@ -1125,12 +1125,12 @@ static int clk_core_enable(struct clk_core *core)
                if (ret)
                        return ret;
 
-               trace_clk_enable_rcuidle(core);
+               trace_clk_enable(core);
 
                if (core->ops->enable)
                        ret = core->ops->enable(core->hw);
 
-               trace_clk_enable_complete_rcuidle(core);
+               trace_clk_enable_complete(core);
 
                if (ret) {
                        clk_core_disable(core->parent);