openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cpuidle/coupled: Remove cpuidle_device::safe_state_index 

cpuidle_device::safe_state_index need to be initialized before
use, it should be the same as cpuidle_driver::safe_state_index.

We tackled this issue by removing the safe_state_index from the
cpuidle_device structure and use the one in the cpuidle_driver
structure instead.

Suggested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Xunlei Pang 2015-08-04 13:48:55 +08:00 committed by Rafael J. Wysocki
parent c75b89ebff
commit ba6a860d41
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cpuidle/coupled.c
View File

@ -473,7 +473,7 @@ int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
return entered_state; return entered_state;
} }
entered_state = cpuidle_enter_state(dev, drv, entered_state = cpuidle_enter_state(dev, drv,
dev->safe_state_index); drv->safe_state_index);
local_irq_disable(); local_irq_disable();
} }
@ -521,7 +521,7 @@ int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
} }
entered_state = cpuidle_enter_state(dev, drv, entered_state = cpuidle_enter_state(dev, drv,
dev->safe_state_index); drv->safe_state_index);
local_irq_disable(); local_irq_disable();
} }

1
include/linux/cpuidle.h
View File

@ -84,7 +84,6 @@ struct cpuidle_device {
struct list_head device_list; struct list_head device_list;
#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
int safe_state_index;
cpumask_t coupled_cpus; cpumask_t coupled_cpus;
struct cpuidle_coupled *coupled; struct cpuidle_coupled *coupled;
#endif #endif