Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / cpuidle / cpuidle-mvebu-v7.c

diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c
index 58fa4e9d704943312e738ec3850a07d5314b48ac..38e68618513a4728fe637a46b6a6ce79edb54730 100644 (file)
--- a/drivers/cpuidle/cpuidle-mvebu-v7.c
+++ b/drivers/cpuidle/cpuidle-mvebu-v7.c
@@ -53,7 +53,6 @@ static struct cpuidle_driver armadaxp_idle_driver = {
                .exit_latency           = 10,
                .power_usage            = 50,
                .target_residency       = 100,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "MV CPU IDLE",
                .desc                   = "CPU power down",
        },
@@ -62,8 +61,7 @@ static struct cpuidle_driver armadaxp_idle_driver = {
                .exit_latency           = 100,
                .power_usage            = 5,
                .target_residency       = 1000,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID |
-                                               MVEBU_V7_FLAG_DEEP_IDLE,
+               .flags                  = MVEBU_V7_FLAG_DEEP_IDLE,
                .name                   = "MV CPU DEEP IDLE",
                .desc                   = "CPU and L2 Fabric power down",
        },
@@ -78,8 +76,7 @@ static struct cpuidle_driver armada370_idle_driver = {
                .exit_latency           = 100,
                .power_usage            = 5,
                .target_residency       = 1000,
-               .flags                  = (CPUIDLE_FLAG_TIME_VALID |
-                                          MVEBU_V7_FLAG_DEEP_IDLE),
+               .flags                  = MVEBU_V7_FLAG_DEEP_IDLE,
                .name                   = "Deep Idle",
                .desc                   = "CPU and L2 Fabric power down",
        },
@@ -94,7 +91,6 @@ static struct cpuidle_driver armada38x_idle_driver = {
                .exit_latency           = 10,
                .power_usage            = 5,
                .target_residency       = 100,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "Idle",
                .desc                   = "CPU and SCU power down",
        },