aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/devfreq/devfreq.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/devfreq/devfreq.c')
-rw-r--r--drivers/devfreq/devfreq.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index c99c00d35d34..f798edcb910d 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -908,7 +908,7 @@ static ssize_t available_frequencies_show(struct device *d,
908 908
909 rcu_read_lock(); 909 rcu_read_lock();
910 do { 910 do {
911 opp = opp_find_freq_ceil(dev, &freq); 911 opp = dev_pm_opp_find_freq_ceil(dev, &freq);
912 if (IS_ERR(opp)) 912 if (IS_ERR(opp))
913 break; 913 break;
914 914
@@ -1036,18 +1036,18 @@ struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq,
1036 1036
1037 if (flags & DEVFREQ_FLAG_LEAST_UPPER_BOUND) { 1037 if (flags & DEVFREQ_FLAG_LEAST_UPPER_BOUND) {
1038 /* The freq is an upper bound. opp should be lower */ 1038 /* The freq is an upper bound. opp should be lower */
1039 opp = opp_find_freq_floor(dev, freq); 1039 opp = dev_pm_opp_find_freq_floor(dev, freq);
1040 1040
1041 /* If not available, use the closest opp */ 1041 /* If not available, use the closest opp */
1042 if (opp == ERR_PTR(-ERANGE)) 1042 if (opp == ERR_PTR(-ERANGE))
1043 opp = opp_find_freq_ceil(dev, freq); 1043 opp = dev_pm_opp_find_freq_ceil(dev, freq);
1044 } else { 1044 } else {
1045 /* The freq is an lower bound. opp should be higher */ 1045 /* The freq is an lower bound. opp should be higher */
1046 opp = opp_find_freq_ceil(dev, freq); 1046 opp = dev_pm_opp_find_freq_ceil(dev, freq);
1047 1047
1048 /* If not available, use the closest opp */ 1048 /* If not available, use the closest opp */
1049 if (opp == ERR_PTR(-ERANGE)) 1049 if (opp == ERR_PTR(-ERANGE))
1050 opp = opp_find_freq_floor(dev, freq); 1050 opp = dev_pm_opp_find_freq_floor(dev, freq);
1051 } 1051 }
1052 1052
1053 return opp; 1053 return opp;
@@ -1066,7 +1066,7 @@ int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq)
1066 int ret = 0; 1066 int ret = 0;
1067 1067
1068 rcu_read_lock(); 1068 rcu_read_lock();
1069 nh = opp_get_notifier(dev); 1069 nh = dev_pm_opp_get_notifier(dev);
1070 if (IS_ERR(nh)) 1070 if (IS_ERR(nh))
1071 ret = PTR_ERR(nh); 1071 ret = PTR_ERR(nh);
1072 rcu_read_unlock(); 1072 rcu_read_unlock();
@@ -1092,7 +1092,7 @@ int devfreq_unregister_opp_notifier(struct device *dev, struct devfreq *devfreq)
1092 int ret = 0; 1092 int ret = 0;
1093 1093
1094 rcu_read_lock(); 1094 rcu_read_lock();
1095 nh = opp_get_notifier(dev); 1095 nh = dev_pm_opp_get_notifier(dev);
1096 if (IS_ERR(nh)) 1096 if (IS_ERR(nh))
1097 ret = PTR_ERR(nh); 1097 ret = PTR_ERR(nh);
1098 rcu_read_unlock(); 1098 rcu_read_unlock();