diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-01 01:46:54 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-01 01:46:54 (GMT) |
| commit | 2af3411f0e559914b8c6e289ed287e166fd502d7 (patch) | |
| tree | 8507df49d028045023e11ef62614fc77ae293b31 /include | |
| parent | 8a497cfdc03412c36ba1689f0e68529d179f4e03 (diff) | |
| parent | b4037aaa584bd914bbf578f5ceb2d9884fa7ddb6 (diff) | |
| download | linux-2af3411f0e559914b8c6e289ed287e166fd502d7.tar.xz | |
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pm_opp.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 0330217..cec2d45 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -21,7 +21,7 @@ struct dev_pm_opp; struct device; enum dev_pm_opp_event { - OPP_EVENT_ADD, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE, + OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE, }; #if defined(CONFIG_PM_OPP) @@ -44,6 +44,7 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev, int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt); +void dev_pm_opp_remove(struct device *dev, unsigned long freq); int dev_pm_opp_enable(struct device *dev, unsigned long freq); @@ -90,6 +91,10 @@ static inline int dev_pm_opp_add(struct device *dev, unsigned long freq, return -EINVAL; } +static inline void dev_pm_opp_remove(struct device *dev, unsigned long freq) +{ +} + static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq) { return 0; @@ -109,11 +114,16 @@ static inline struct srcu_notifier_head *dev_pm_opp_get_notifier( #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF) int of_init_opp_table(struct device *dev); +void of_free_opp_table(struct device *dev); #else static inline int of_init_opp_table(struct device *dev) { return -EINVAL; } + +static inline void of_free_opp_table(struct device *dev) +{ +} #endif #endif /* __LINUX_OPP_H__ */ |