Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c
index fac2b26932dd7fc4ff121e6bc6edd98ed65b0c47..26d940d40b1dcb1e19208a17176afe88e5632f35 100644 (file)
--- a/drivers/cpufreq/cris-etraxfs-cpufreq.c
+++ b/drivers/cpufreq/cris-etraxfs-cpufreq.c
@@ -27,18 +27,11 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)
        return clk_ctrl.pll ? 200000 : 6000;
 }
 
-static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,
-               unsigned int state)
+static int cris_freq_target(struct cpufreq_policy *policy, unsigned int state)
 {
-       struct cpufreq_freqs freqs;
        reg_config_rw_clk_ctrl clk_ctrl;
        clk_ctrl = REG_RD(config, regi_config, rw_clk_ctrl);
 
-       freqs.old = cris_freq_get_cpu_frequency(policy->cpu);
-       freqs.new = cris_freq_table[state].frequency;
-
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
-
        local_irq_disable();
 
        /* Even though we may be SMP they will share the same clock
@@ -51,20 +44,6 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy,
 
        local_irq_enable();
 
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
-};
-
-static int cris_freq_target(struct cpufreq_policy *policy,
-                           unsigned int target_freq, unsigned int relation)
-{
-       unsigned int newstate = 0;
-
-       if (cpufreq_frequency_table_target
-           (policy, cris_freq_table, target_freq, relation, &newstate))
-               return -EINVAL;
-
-       cris_freq_set_cpu_state(policy, newstate);
-
        return 0;
 }
 
@@ -76,7 +55,7 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy)
 static struct cpufreq_driver cris_freq_driver = {
        .get = cris_freq_get_cpu_frequency,
        .verify = cpufreq_generic_frequency_table_verify,
-       .target = cris_freq_target,
+       .target_index = cris_freq_target,
        .init = cris_freq_cpu_init,
        .exit = cpufreq_generic_exit,
        .name = "cris_freq",