@@ -108,9 +108,15 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)
static int elanfreq_target(struct cpufreq_policy *policy,
- unsigned int state)
+ unsigned int index)
{
/*
+ * policy->freq_table may be sorted differently, get the index value we
+ * are concerned about.
+ */
+ unsigned int state = policy->freq_table[index].driver_data;
+
+ /*
* Access to the Elan's internal registers is indexed via
* 0x22: Chip Setup & Control Register Index Register (CSCI)
* 0x23: Chip Setup & Control Register Data Register (CSCD)
Later patches would make changes in cpufreq core, after which policy->freq_table may be reordered by cpufreq core and it wouldn't be safe anymore to use 'index' for any other local arrays. To prepare for that, use policy->freq_table[index].driver_data for other driver specific usage of 'index'. The 'driver_data' fields are already set properly by the driver. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/cpufreq/elanfreq.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.7.1.410.g6faf27b