cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic

The only place where the time is invalid is when the ACPI_CSTATE_FFH entry
method is not set. Otherwise for all the drivers, the time can be correctly
measured.

Instead of duplicating the CPUIDLE_FLAG_TIME_VALID flag in all the drivers
for all the states, just invert the logic by replacing it by the flag
CPUIDLE_FLAG_TIME_INVALID, hence we can set this flag only for the acpi idle
driver, remove the former flag from all the drivers and invert the logic with
this flag in the different governor.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 2 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index e18709d3b95d..aa7b379e2661 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -265,7 +265,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                         .enter            = omap3_enter_idle_bm,
                         .exit_latency     = 2 + 2,
                         .target_residency = 5,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
                         .name             = "C1",
                         .desc             = "MPU ON + CORE ON",
                 },
@@ -273,7 +272,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                         .enter            = omap3_enter_idle_bm,
                         .exit_latency     = 10 + 10,
                         .target_residency = 30,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
                         .name             = "C2",
                         .desc             = "MPU ON + CORE ON",
                 },
@@ -281,7 +279,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                         .enter            = omap3_enter_idle_bm,
                         .exit_latency     = 50 + 50,
                         .target_residency = 300,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
                         .name             = "C3",
                         .desc             = "MPU RET + CORE ON",
                 },
@@ -289,7 +286,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                         .enter            = omap3_enter_idle_bm,
                         .exit_latency     = 1500 + 1800,
                         .target_residency = 4000,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
                         .name             = "C4",
                         .desc             = "MPU OFF + CORE ON",
                 },
@@ -297,7 +293,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                         .enter            = omap3_enter_idle_bm,
                         .exit_latency     = 2500 + 7500,
                         .target_residency = 12000,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
                         .name             = "C5",
                         .desc             = "MPU RET + CORE RET",
                 },
@@ -305,7 +300,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                         .enter            = omap3_enter_idle_bm,
                         .exit_latency     = 3000 + 8500,
                         .target_residency = 15000,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
                         .name             = "C6",
                         .desc             = "MPU OFF + CORE RET",
                 },
@@ -313,7 +307,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                         .enter            = omap3_enter_idle_bm,
                         .exit_latency     = 10000 + 30000,
                         .target_residency = 30000,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
                         .name             = "C7",
                         .desc             = "MPU OFF + CORE OFF",
                 },
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index 2498ab025fa2..01e398a868bc 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -196,7 +196,6 @@ static struct cpuidle_driver omap4_idle_driver = {
                         /* C1 - CPU0 ON + CPU1 ON + MPU ON */
                         .exit_latency = 2 + 2,
                         .target_residency = 5,
-                        .flags = CPUIDLE_FLAG_TIME_VALID,
                         .enter = omap_enter_idle_simple,
                         .name = "C1",
                         .desc = "CPUx ON, MPUSS ON"
@@ -205,7 +204,7 @@ static struct cpuidle_driver omap4_idle_driver = {
                         /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
                         .exit_latency = 328 + 440,
                         .target_residency = 960,
-                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
+                        .flags = CPUIDLE_FLAG_COUPLED,
                         .enter = omap_enter_idle_coupled,
                         .name = "C2",
                         .desc = "CPUx OFF, MPUSS CSWR",
@@ -214,7 +213,7 @@ static struct cpuidle_driver omap4_idle_driver = {
                         /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
                         .exit_latency = 460 + 518,
                         .target_residency = 1100,
-                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
+                        .flags = CPUIDLE_FLAG_COUPLED,
                         .enter = omap_enter_idle_coupled,
                         .name = "C3",
                         .desc = "CPUx OFF, MPUSS OSWR",