cpufreq: Drop freq-table param to cpufreq_frequency_table_target()

The policy already has this pointer set, use it instead.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/cpu-freq/cpu-drivers.txt
index decbb8c..74e812f 100644 (file)
--- a/Documentation/cpu-freq/cpu-drivers.txt
+++ b/Documentation/cpu-freq/cpu-drivers.txt
@@ -244,7 +244,6 @@ policy->max, and all other criteria are met. This is helpful for the
 ->verify call.
 
 int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
-                                   struct cpufreq_frequency_table *table,
                                    unsigned int target_freq,
                                    unsigned int relation,
                                    unsigned int *index);

diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c
index bc86816..3bea1bb 100644 (file)
--- a/drivers/cpufreq/amd_freq_sensitivity.c
+++ b/drivers/cpufreq/amd_freq_sensitivity.c
@@ -92,8 +92,7 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy,
                        unsigned int index;
 
                        cpufreq_frequency_table_target(policy,
-                               policy->freq_table, policy->cur - 1,
-                               CPUFREQ_RELATION_H, &index);
+                               policy->cur - 1, CPUFREQ_RELATION_H, &index);
                        freq_next = policy->freq_table[index].frequency;
                }
 

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index cc252ee..a281446 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1947,8 +1947,8 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
                return -EINVAL;
        }
 
-       retval = cpufreq_frequency_table_target(policy, freq_table, target_freq,
-                                               relation, &index);
+       retval = cpufreq_frequency_table_target(policy, target_freq, relation,
+                                               &index);
        if (unlikely(retval)) {
                pr_err("%s: Unable to find matching freq\n", __func__);
                return retval;

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 528353f..2ee476f 100644 (file)
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -79,20 +79,19 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy,
                return freq_next;
        }
 
-       cpufreq_frequency_table_target(policy, freq_table, freq_next, relation,
-                                      &index);
+       cpufreq_frequency_table_target(policy, freq_next, relation, &index);
        freq_req = freq_table[index].frequency;
        freq_reduc = freq_req * od_tuners->powersave_bias / 1000;
        freq_avg = freq_req - freq_reduc;
 
        /* Find freq bounds for freq_avg in freq_table */
        index = 0;
-       cpufreq_frequency_table_target(policy, freq_table, freq_avg,
-                                      CPUFREQ_RELATION_H, &index);
+       cpufreq_frequency_table_target(policy, freq_avg, CPUFREQ_RELATION_H,
+                                      &index);
        freq_lo = freq_table[index].frequency;
        index = 0;
-       cpufreq_frequency_table_target(policy, freq_table, freq_avg,
-                                      CPUFREQ_RELATION_L, &index);
+       cpufreq_frequency_table_target(policy, freq_avg, CPUFREQ_RELATION_L,
+                                      &index);
        freq_hi = freq_table[index].frequency;
 
        /* Find out how long we have to be in hi and lo freqs */

diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index f52b547..f145b64 100644 (file)
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -114,7 +114,6 @@ int cpufreq_generic_frequency_table_verify(struct cpufreq_policy *policy)
 EXPORT_SYMBOL_GPL(cpufreq_generic_frequency_table_verify);
 
 int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
-                                  struct cpufreq_frequency_table *table,
                                   unsigned int target_freq,
                                   unsigned int relation,
                                   unsigned int *index)
@@ -128,6 +127,7 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                .frequency = 0,
        };
        struct cpufreq_frequency_table *pos;
+       struct cpufreq_frequency_table *table = policy->freq_table;
        unsigned int freq, diff, i = 0;
 
        pr_debug("request for target %u kHz (relation: %u) for cpu %u\n",

diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index 54c4536..bf267c2 100644 (file)
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -760,8 +760,7 @@ void powernv_cpufreq_work_fn(struct work_struct *work)
                struct cpufreq_policy policy;
 
                cpufreq_get_policy(&policy, cpu);
-               cpufreq_frequency_table_target(&policy, policy.freq_table,
-                                              policy.cur,
+               cpufreq_frequency_table_target(&policy, policy.cur,
                                               CPUFREQ_RELATION_C, &index);
                powernv_cpufreq_target_index(&policy, index);
                cpumask_andnot(&mask, &mask, policy.cpus);

diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c
index 4567c3c..05a9737 100644 (file)
--- a/drivers/cpufreq/s3c24xx-cpufreq.c
+++ b/drivers/cpufreq/s3c24xx-cpufreq.c
@@ -293,9 +293,8 @@ static int s3c_cpufreq_target(struct cpufreq_policy *policy,
                     __func__, policy, target_freq, relation);
 
        if (ftab) {
-               if (cpufreq_frequency_table_target(policy, ftab,
-                                                  target_freq, relation,
-                                                  &index)) {
+               if (cpufreq_frequency_table_target(policy, target_freq,
+                                                  relation, &index)) {
                        s3c_freq_dbg("%s: table failed\n", __func__);
                        return -EINVAL;
                }
@@ -323,14 +322,14 @@ static int s3c_cpufreq_target(struct cpufreq_policy *policy,
                tmp_policy.min = policy->min * 1000;
                tmp_policy.max = policy->max * 1000;
                tmp_policy.cpu = policy->cpu;
+               tmp_policy.freq_table = pll_reg;
 
                /* cpufreq_frequency_table_target uses a pointer to 'index'
                 * which is the number of the table entry, not the value of
                 * the table entry's index field. */
 
-               ret = cpufreq_frequency_table_target(&tmp_policy, pll_reg,
-                                                    target_freq, relation,
-                                                    &index);
+               ret = cpufreq_frequency_table_target(&tmp_policy, target_freq,
+                                                    relation, &index);
 
                if (ret < 0) {
                        pr_err("%s: no PLL available\n", __func__);

diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index 06d8591..6b0cfc3 100644 (file)
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -246,8 +246,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, unsigned int index)
        new_freq = s5pv210_freq_table[index].frequency;
 
        /* Finding current running level index */
-       if (cpufreq_frequency_table_target(policy, s5pv210_freq_table,
-                                          old_freq, CPUFREQ_RELATION_H,
+       if (cpufreq_frequency_table_target(policy, old_freq, CPUFREQ_RELATION_H,
                                           &priv_index)) {
                ret = -EINVAL;
                goto exit;

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 1342cbc..bdd7f0c 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -598,7 +598,6 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
 int cpufreq_generic_frequency_table_verify(struct cpufreq_policy *policy);
 
 int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
-                                  struct cpufreq_frequency_table *table,
                                   unsigned int target_freq,
                                   unsigned int relation,
                                   unsigned int *index);