diff options
Diffstat (limited to 'drivers/cpufreq/ppc_cbe_cpufreq.c')
-rw-r--r-- | drivers/cpufreq/ppc_cbe_cpufreq.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c index 52f707d5f458..e42ca9c31cea 100644 --- a/drivers/cpufreq/ppc_cbe_cpufreq.c +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c | |||
@@ -30,9 +30,6 @@ | |||
30 | 30 | ||
31 | #include "ppc_cbe_cpufreq.h" | 31 | #include "ppc_cbe_cpufreq.h" |
32 | 32 | ||
33 | static DEFINE_MUTEX(cbe_switch_mutex); | ||
34 | |||
35 | |||
36 | /* the CBE supports an 8 step frequency scaling */ | 33 | /* the CBE supports an 8 step frequency scaling */ |
37 | static struct cpufreq_frequency_table cbe_freqs[] = { | 34 | static struct cpufreq_frequency_table cbe_freqs[] = { |
38 | {1, 0}, | 35 | {1, 0}, |
@@ -131,27 +128,13 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
131 | static int cbe_cpufreq_target(struct cpufreq_policy *policy, | 128 | static int cbe_cpufreq_target(struct cpufreq_policy *policy, |
132 | unsigned int cbe_pmode_new) | 129 | unsigned int cbe_pmode_new) |
133 | { | 130 | { |
134 | int rc; | ||
135 | struct cpufreq_freqs freqs; | ||
136 | |||
137 | freqs.old = policy->cur; | ||
138 | freqs.new = cbe_freqs[cbe_pmode_new].frequency; | ||
139 | |||
140 | mutex_lock(&cbe_switch_mutex); | ||
141 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | ||
142 | |||
143 | pr_debug("setting frequency for cpu %d to %d kHz, " \ | 131 | pr_debug("setting frequency for cpu %d to %d kHz, " \ |
144 | "1/%d of max frequency\n", | 132 | "1/%d of max frequency\n", |
145 | policy->cpu, | 133 | policy->cpu, |
146 | cbe_freqs[cbe_pmode_new].frequency, | 134 | cbe_freqs[cbe_pmode_new].frequency, |
147 | cbe_freqs[cbe_pmode_new].driver_data); | 135 | cbe_freqs[cbe_pmode_new].driver_data); |
148 | 136 | ||
149 | rc = set_pmode(policy->cpu, cbe_pmode_new); | 137 | return set_pmode(policy->cpu, cbe_pmode_new); |
150 | |||
151 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | ||
152 | mutex_unlock(&cbe_switch_mutex); | ||
153 | |||
154 | return rc; | ||
155 | } | 138 | } |
156 | 139 | ||
157 | static struct cpufreq_driver cbe_cpufreq_driver = { | 140 | static struct cpufreq_driver cbe_cpufreq_driver = { |