diff options
Diffstat (limited to 'drivers/cpufreq/cris-etraxfs-cpufreq.c')
-rw-r--r-- | drivers/cpufreq/cris-etraxfs-cpufreq.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c index fac2b26932dd..c58811abd961 100644 --- a/drivers/cpufreq/cris-etraxfs-cpufreq.c +++ b/drivers/cpufreq/cris-etraxfs-cpufreq.c | |||
@@ -27,8 +27,7 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu) | |||
27 | return clk_ctrl.pll ? 200000 : 6000; | 27 | return clk_ctrl.pll ? 200000 : 6000; |
28 | } | 28 | } |
29 | 29 | ||
30 | static void cris_freq_set_cpu_state(struct cpufreq_policy *policy, | 30 | static int cris_freq_target(struct cpufreq_policy *policy, unsigned int state) |
31 | unsigned int state) | ||
32 | { | 31 | { |
33 | struct cpufreq_freqs freqs; | 32 | struct cpufreq_freqs freqs; |
34 | reg_config_rw_clk_ctrl clk_ctrl; | 33 | reg_config_rw_clk_ctrl clk_ctrl; |
@@ -52,18 +51,6 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy, | |||
52 | local_irq_enable(); | 51 | local_irq_enable(); |
53 | 52 | ||
54 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 53 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
55 | }; | ||
56 | |||
57 | static int cris_freq_target(struct cpufreq_policy *policy, | ||
58 | unsigned int target_freq, unsigned int relation) | ||
59 | { | ||
60 | unsigned int newstate = 0; | ||
61 | |||
62 | if (cpufreq_frequency_table_target | ||
63 | (policy, cris_freq_table, target_freq, relation, &newstate)) | ||
64 | return -EINVAL; | ||
65 | |||
66 | cris_freq_set_cpu_state(policy, newstate); | ||
67 | 54 | ||
68 | return 0; | 55 | return 0; |
69 | } | 56 | } |
@@ -76,7 +63,7 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy) | |||
76 | static struct cpufreq_driver cris_freq_driver = { | 63 | static struct cpufreq_driver cris_freq_driver = { |
77 | .get = cris_freq_get_cpu_frequency, | 64 | .get = cris_freq_get_cpu_frequency, |
78 | .verify = cpufreq_generic_frequency_table_verify, | 65 | .verify = cpufreq_generic_frequency_table_verify, |
79 | .target = cris_freq_target, | 66 | .target_index = cris_freq_target, |
80 | .init = cris_freq_cpu_init, | 67 | .init = cris_freq_cpu_init, |
81 | .exit = cpufreq_generic_exit, | 68 | .exit = cpufreq_generic_exit, |
82 | .name = "cris_freq", | 69 | .name = "cris_freq", |