diff options
author | Richard Cochran <rcochran@linutronix.de> | 2016-04-06 17:00:50 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-07 16:10:53 -0400 |
commit | 4a3dfb3fc0fb0fc9acd36c94b7145f9c9dd4d93a (patch) | |
tree | a41662967818967f79a32924c11314c02be991cc /drivers/idle/intel_idle.c | |
parent | 5469c827d20ab013f43d4f5f94e101d0cf7afd2c (diff) |
intel_idle: Remove redundant initialization calls.
The function, intel_idle_cpuidle_driver_init, makes calls on each CPU
to auto_demotion_disable() and c1e_promotion_disable(). These calls
are redundant, as intel_idle_cpu_init() does the same calls just a bit
later on. They are also premature, as the driver registration may yet
fail.
This patch removes the redundant code.
Signed-off-by: Richard Cochran <rcochran@linutronix.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/idle/intel_idle.c')
-rw-r--r-- | drivers/idle/intel_idle.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index dfa90558babf..cb85c4c42ff9 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
@@ -1163,16 +1163,10 @@ static void __init intel_idle_cpuidle_driver_init(void) | |||
1163 | drv->state_count += 1; | 1163 | drv->state_count += 1; |
1164 | } | 1164 | } |
1165 | 1165 | ||
1166 | if (icpu->auto_demotion_disable_flags) | ||
1167 | on_each_cpu(auto_demotion_disable, NULL, 1); | ||
1168 | |||
1169 | if (icpu->byt_auto_demotion_disable_flag) { | 1166 | if (icpu->byt_auto_demotion_disable_flag) { |
1170 | wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0); | 1167 | wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0); |
1171 | wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0); | 1168 | wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0); |
1172 | } | 1169 | } |
1173 | |||
1174 | if (icpu->disable_promotion_to_c1e) /* each-cpu is redundant */ | ||
1175 | on_each_cpu(c1e_promotion_disable, NULL, 1); | ||
1176 | } | 1170 | } |
1177 | 1171 | ||
1178 | 1172 | ||