Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / s3c2416-cpufreq.c

diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index 4f1881eee3f12a803a58ae373f044551f87d4edb..ce5b9fca9c1871eed562add6fb35f3979ab7fd8a 100644 (file)
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -205,7 +205,7 @@ static int s3c2416_cpufreq_leave_dvs(struct s3c2416_data *s3c_freq, int idx)
                ret = s3c2416_cpufreq_set_armdiv(s3c_freq,
                                        clk_get_rate(s3c_freq->hclk) / 1000);
                if (ret < 0) {
-                       pr_err("cpufreq: Failed to to set the armdiv to %lukHz: %d\n",
+                       pr_err("cpufreq: Failed to set the armdiv to %lukHz: %d\n",
                               clk_get_rate(s3c_freq->hclk) / 1000, ret);
                        return ret;
                }
@@ -244,7 +244,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,
        if (ret != 0)
                goto out;
 
-       idx = s3c_freq->freq_table[i].index;
+       idx = s3c_freq->freq_table[i].driver_data;
 
        if (idx == SOURCE_HCLK)
                to_dvs = 1;
@@ -312,7 +312,7 @@ static void __init s3c2416_cpufreq_cfg_regulator(struct s3c2416_data *s3c_freq)
                if (freq->frequency == CPUFREQ_ENTRY_INVALID)
                        continue;
 
-               dvfs = &s3c2416_dvfs_table[freq->index];
+               dvfs = &s3c2416_dvfs_table[freq->driver_data];
                found = 0;
 
                /* Check only the min-voltage, more is always ok on S3C2416 */
@@ -462,7 +462,7 @@ static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)
        freq = s3c_freq->freq_table;
        while (freq->frequency != CPUFREQ_TABLE_END) {
                /* special handling for dvs mode */
-               if (freq->index == 0) {
+               if (freq->driver_data == 0) {
                        if (!s3c_freq->hclk) {
                                pr_debug("cpufreq: %dkHz unsupported as it would need unavailable dvs mode\n",
                                         freq->frequency);