diff options
Diffstat (limited to 'include/linux/devfreq.h')
-rw-r--r-- | include/linux/devfreq.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 5f1ab92107e6..d48dc00232a4 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
17 | #include <linux/notifier.h> | 17 | #include <linux/notifier.h> |
18 | #include <linux/opp.h> | 18 | #include <linux/pm_opp.h> |
19 | 19 | ||
20 | #define DEVFREQ_NAME_LEN 16 | 20 | #define DEVFREQ_NAME_LEN 16 |
21 | 21 | ||
@@ -168,7 +168,7 @@ struct devfreq { | |||
168 | unsigned long max_freq; | 168 | unsigned long max_freq; |
169 | bool stop_polling; | 169 | bool stop_polling; |
170 | 170 | ||
171 | /* information for device freqeuncy transition */ | 171 | /* information for device frequency transition */ |
172 | unsigned int total_trans; | 172 | unsigned int total_trans; |
173 | unsigned int *trans_table; | 173 | unsigned int *trans_table; |
174 | unsigned long *time_in_state; | 174 | unsigned long *time_in_state; |
@@ -187,7 +187,7 @@ extern int devfreq_suspend_device(struct devfreq *devfreq); | |||
187 | extern int devfreq_resume_device(struct devfreq *devfreq); | 187 | extern int devfreq_resume_device(struct devfreq *devfreq); |
188 | 188 | ||
189 | /* Helper functions for devfreq user device driver with OPP. */ | 189 | /* Helper functions for devfreq user device driver with OPP. */ |
190 | extern struct opp *devfreq_recommended_opp(struct device *dev, | 190 | extern struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, |
191 | unsigned long *freq, u32 flags); | 191 | unsigned long *freq, u32 flags); |
192 | extern int devfreq_register_opp_notifier(struct device *dev, | 192 | extern int devfreq_register_opp_notifier(struct device *dev, |
193 | struct devfreq *devfreq); | 193 | struct devfreq *devfreq); |
@@ -238,7 +238,7 @@ static inline int devfreq_resume_device(struct devfreq *devfreq) | |||
238 | return 0; | 238 | return 0; |
239 | } | 239 | } |
240 | 240 | ||
241 | static inline struct opp *devfreq_recommended_opp(struct device *dev, | 241 | static inline struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, |
242 | unsigned long *freq, u32 flags) | 242 | unsigned long *freq, u32 flags) |
243 | { | 243 | { |
244 | return ERR_PTR(-EINVAL); | 244 | return ERR_PTR(-EINVAL); |