PM / OPP: rename data structures to dev_pm equivalents

[cascardo/linux.git] / include / linux / opp.h

diff --git a/include/linux/opp.h b/include/linux/opp.h
index 3aca2b8..5151b00 100644 (file)
--- a/include/linux/opp.h
+++ b/include/linux/opp.h
@@ -18,86 +18,91 @@
 #include <linux/cpufreq.h>
 #include <linux/notifier.h>
 
-struct opp;
+struct dev_pm_opp;
 struct device;
 
-enum opp_event {
+enum dev_pm_opp_event {
        OPP_EVENT_ADD, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE,
 };
 
 #if defined(CONFIG_PM_OPP)
 
-unsigned long opp_get_voltage(struct opp *opp);
+unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp);
 
-unsigned long opp_get_freq(struct opp *opp);
+unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp);
 
-int opp_get_opp_count(struct device *dev);
+int dev_pm_opp_get_opp_count(struct device *dev);
 
-struct opp *opp_find_freq_exact(struct device *dev, unsigned long freq,
-                               bool available);
+struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
+                                             unsigned long freq,
+                                             bool available);
 
-struct opp *opp_find_freq_floor(struct device *dev, unsigned long *freq);
+struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,
+                                             unsigned long *freq);
 
-struct opp *opp_find_freq_ceil(struct device *dev, unsigned long *freq);
+struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
+                                            unsigned long *freq);
 
-int opp_add(struct device *dev, unsigned long freq, unsigned long u_volt);
+int dev_pm_opp_add(struct device *dev, unsigned long freq,
+                  unsigned long u_volt);
 
-int opp_enable(struct device *dev, unsigned long freq);
+int dev_pm_opp_enable(struct device *dev, unsigned long freq);
 
-int opp_disable(struct device *dev, unsigned long freq);
+int dev_pm_opp_disable(struct device *dev, unsigned long freq);
 
-struct srcu_notifier_head *opp_get_notifier(struct device *dev);
+struct srcu_notifier_head *dev_pm_opp_get_notifier(struct device *dev);
 #else
-static inline unsigned long opp_get_voltage(struct opp *opp)
+static inline unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)
 {
        return 0;
 }
 
-static inline unsigned long opp_get_freq(struct opp *opp)
+static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
 {
        return 0;
 }
 
-static inline int opp_get_opp_count(struct device *dev)
+static inline int dev_pm_opp_get_opp_count(struct device *dev)
 {
        return 0;
 }
 
-static inline struct opp *opp_find_freq_exact(struct device *dev,
+static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
                                        unsigned long freq, bool available)
 {
        return ERR_PTR(-EINVAL);
 }
 
-static inline struct opp *opp_find_freq_floor(struct device *dev,
+static inline struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,
                                        unsigned long *freq)
 {
        return ERR_PTR(-EINVAL);
 }
 
-static inline struct opp *opp_find_freq_ceil(struct device *dev,
+static inline struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
                                        unsigned long *freq)
 {
        return ERR_PTR(-EINVAL);
 }
 
-static inline int opp_add(struct device *dev, unsigned long freq,
+static inline int dev_pm_opp_add(struct device *dev, unsigned long freq,
                                        unsigned long u_volt)
 {
        return -EINVAL;
 }
 
-static inline int opp_enable(struct device *dev, unsigned long freq)
+static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq)
 {
        return 0;
 }
 
-static inline int opp_disable(struct device *dev, unsigned long freq)
+static inline int dev_pm_opp_disable(struct device *dev, unsigned long freq)
 {
        return 0;
 }
 
-static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev)
+static inline struct srcu_notifier_head *dev_pm_opp_get_notifier(
+                                                       struct device *dev)
 {
        return ERR_PTR(-EINVAL);
 }
@@ -113,19 +118,19 @@ static inline int of_init_opp_table(struct device *dev)
 #endif
 
 #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
-int opp_init_cpufreq_table(struct device *dev,
+int dev_pm_opp_init_cpufreq_table(struct device *dev,
                            struct cpufreq_frequency_table **table);
-void opp_free_cpufreq_table(struct device *dev,
+void dev_pm_opp_free_cpufreq_table(struct device *dev,
                                struct cpufreq_frequency_table **table);
 #else
-static inline int opp_init_cpufreq_table(struct device *dev,
+static inline int dev_pm_opp_init_cpufreq_table(struct device *dev,
                            struct cpufreq_frequency_table **table)
 {
        return -EINVAL;
 }
 
 static inline
-void opp_free_cpufreq_table(struct device *dev,
+void dev_pm_opp_free_cpufreq_table(struct device *dev,
                                struct cpufreq_frequency_table **table)
 {
 }