summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-11 16:37:17 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-11 16:37:17 +0300
commit7c976664d537bca19c9bf892b4d9e5ab7ecea927 (patch)
treedf910dfff1eef04c3d5e9dc585579ae4e96c42ba /include
parentae982073095a44f004d7ffb9f271077abef9dbcf (diff)
parent1b2b90cbea00670221f062814dc8bcecb3af7b90 (diff)
downloadlinux-7c976664d537bca19c9bf892b4d9e5ab7ecea927.tar.xz
Merge branch 'pm-opp'
* pm-opp: PM / OPP: Return suspend_opp only if it is enabled PM / OPP: add dev_pm_opp_get_suspend_opp() helper
Diffstat (limited to 'include')
-rw-r--r--include/linux/pm_opp.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
index cab7ba55bedb..e817722ee3f0 100644
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
@@ -34,6 +34,7 @@ bool dev_pm_opp_is_turbo(struct dev_pm_opp *opp);
int dev_pm_opp_get_opp_count(struct device *dev);
unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev);
+struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev);
struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
unsigned long freq,
@@ -80,6 +81,11 @@ static inline unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev)
return 0;
}
+static inline struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)
+{
+ return NULL;
+}
+
static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
unsigned long freq, bool available)
{