aboutsummaryrefslogtreecommitdiff
path: root/drivers/gator/gator_trace_power.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-05-12 15:35:14 -0700
committerKevin Hilman <khilman@linaro.org>2015-05-12 15:35:14 -0700
commit106f1ce29f1fa7ad18e47823789c176df57d75ee (patch)
tree44f6a51ff81fefba6834383dc2bcb45aa4ebe60e /drivers/gator/gator_trace_power.c
parent1f8fdf83fe376cc83e96e942689a6cfac01e9634 (diff)
parent0ed41f1a9564c0733ad155b742ac66fb41d2f9d3 (diff)
downloadlinux-linaro-stable-106f1ce29f1fa7ad18e47823789c176df57d75ee.tar.gz
Merge branch 'v3.10/topic/gator' into linux-linaro-lsk-v3.10
* v3.10/topic/gator: gator: Enable multiple source copies to exist in Android build environments gator: Add config for building the module in-tree gator: Version 5.21.1
Diffstat (limited to 'drivers/gator/gator_trace_power.c')
-rw-r--r--drivers/gator/gator_trace_power.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gator/gator_trace_power.c b/drivers/gator/gator_trace_power.c
index 46e04b29a187..aaa8f8636c83 100644
--- a/drivers/gator/gator_trace_power.c
+++ b/drivers/gator/gator_trace_power.c
@@ -1,5 +1,5 @@
/**
- * Copyright (C) ARM Limited 2011-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2011-2015. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -80,13 +80,7 @@ GATOR_DEFINE_PROBE(cpu_idle, TP_PROTO(unsigned int state, unsigned int cpu))
return;
if (implements_wfi()) {
- if (state == PWR_EVENT_EXIT) {
- /* transition from wfi to non-wfi */
- marshal_idle(cpu, MESSAGE_IDLE_EXIT);
- } else {
- /* transition from non-wfi to wfi */
- marshal_idle(cpu, MESSAGE_IDLE_ENTER);
- }
+ marshal_idle(cpu, state);
}
per_cpu(idle_prev_state, cpu) = state;