diff options
Diffstat (limited to 'drivers/cpufreq/omap-cpufreq.c')
-rw-r--r-- | drivers/cpufreq/omap-cpufreq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index f31fcfcad514..c5e31d296607 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c | |||
@@ -105,14 +105,14 @@ static int omap_target(struct cpufreq_policy *policy, | |||
105 | 105 | ||
106 | if (mpu_reg) { | 106 | if (mpu_reg) { |
107 | rcu_read_lock(); | 107 | rcu_read_lock(); |
108 | opp = opp_find_freq_ceil(mpu_dev, &freq); | 108 | opp = dev_pm_opp_find_freq_ceil(mpu_dev, &freq); |
109 | if (IS_ERR(opp)) { | 109 | if (IS_ERR(opp)) { |
110 | rcu_read_unlock(); | 110 | rcu_read_unlock(); |
111 | dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", | 111 | dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", |
112 | __func__, freqs.new); | 112 | __func__, freqs.new); |
113 | return -EINVAL; | 113 | return -EINVAL; |
114 | } | 114 | } |
115 | volt = opp_get_voltage(opp); | 115 | volt = dev_pm_opp_get_voltage(opp); |
116 | rcu_read_unlock(); | 116 | rcu_read_unlock(); |
117 | tol = volt * OPP_TOLERANCE / 100; | 117 | tol = volt * OPP_TOLERANCE / 100; |
118 | volt_old = regulator_get_voltage(mpu_reg); | 118 | volt_old = regulator_get_voltage(mpu_reg); |
@@ -162,7 +162,7 @@ done: | |||
162 | static inline void freq_table_free(void) | 162 | static inline void freq_table_free(void) |
163 | { | 163 | { |
164 | if (atomic_dec_and_test(&freq_table_users)) | 164 | if (atomic_dec_and_test(&freq_table_users)) |
165 | opp_free_cpufreq_table(mpu_dev, &freq_table); | 165 | dev_pm_opp_free_cpufreq_table(mpu_dev, &freq_table); |
166 | } | 166 | } |
167 | 167 | ||
168 | static int omap_cpu_init(struct cpufreq_policy *policy) | 168 | static int omap_cpu_init(struct cpufreq_policy *policy) |
@@ -181,7 +181,7 @@ static int omap_cpu_init(struct cpufreq_policy *policy) | |||
181 | policy->cur = omap_getspeed(policy->cpu); | 181 | policy->cur = omap_getspeed(policy->cpu); |
182 | 182 | ||
183 | if (!freq_table) | 183 | if (!freq_table) |
184 | result = opp_init_cpufreq_table(mpu_dev, &freq_table); | 184 | result = dev_pm_opp_init_cpufreq_table(mpu_dev, &freq_table); |
185 | 185 | ||
186 | if (result) { | 186 | if (result) { |
187 | dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n", | 187 | dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n", |