Commit ba6a860d authored by Xunlei Pang's avatar Xunlei Pang Committed by Rafael J. Wysocki

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: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarXunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c75b89eb
...@@ -473,7 +473,7 @@ int cpuidle_enter_state_coupled(struct cpuidle_device *dev, ...@@ -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, ...@@ -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();
} }
......
...@@ -84,7 +84,6 @@ struct cpuidle_device { ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment