hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

intel_idle: Don't overreact to a cpuidle registration failure. 

The helper function, intel_idle_cpu_init, registers one new device
with the cpuidle layer.  If the registration should fail, that
function immediately calls intel_idle_cpuidle_devices_uninit() to
unregister every last CPU's device.  However, it makes no sense to do
so, when called from the hot plug notifier callback.

This patch moves the call to intel_idle_cpuidle_devices_uninit()
outside of the helper function to the one call site that actually
needs to perform the de-registrations.

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>
This commit is contained in:
Richard Cochran 2016-04-06 17:00:55 -04:00 committed by Rafael J. Wysocki
parent 2259a819a8
commit b69ef2c099
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/idle/intel_idle.c
View File

@ -1175,7 +1175,6 @@ static int intel_idle_cpu_init(int cpu)
if (cpuidle_register_device(dev)) { if (cpuidle_register_device(dev)) {
pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu); pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu);
intel_idle_cpuidle_devices_uninit();
return -EIO; return -EIO;
} }
@ -1219,6 +1218,7 @@ static int __init intel_idle_init(void)
for_each_online_cpu(i) { for_each_online_cpu(i) {
retval = intel_idle_cpu_init(i); retval = intel_idle_cpu_init(i);
if (retval) { if (retval) {
intel_idle_cpuidle_devices_uninit();
cpu_notifier_register_done(); cpu_notifier_register_done();
cpuidle_unregister_driver(&intel_idle_driver); cpuidle_unregister_driver(&intel_idle_driver);
free_percpu(intel_idle_cpuidle_devices); free_percpu(intel_idle_cpuidle_devices);