15 files changed, 187 insertions, 183 deletions

diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt
index 425c51d56aef..185367b1848f 100644
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
@@ -71,14 +71,14 @@ operations until that OPP could be re-enabled if possible.
 
 OPP library facilitates this concept in it's implementation. The following
 operational functions operate only on available opps:
-opp_find_freq_{ceil, floor}, opp_get_voltage, opp_get_freq, opp_get_opp_count
-and opp_init_cpufreq_table
+opp_find_freq_{ceil, floor}, dev_pm_opp_get_voltage, dev_pm_opp_get_freq, dev_pm_opp_get_opp_count
+and dev_pm_opp_init_cpufreq_table
 
-opp_find_freq_exact is meant to be used to find the opp pointer which can then
-be used for opp_enable/disable functions to make an opp available as required.
+dev_pm_opp_find_freq_exact is meant to be used to find the opp pointer which can then
+be used for dev_pm_opp_enable/disable functions to make an opp available as required.
 
 WARNING: Users of OPP library should refresh their availability count using
-get_opp_count if opp_enable/disable functions are invoked for a device, the
+get_opp_count if dev_pm_opp_enable/disable functions are invoked for a device, the
 exact mechanism to trigger these or the notification mechanism to other
 dependent subsystems such as cpufreq are left to the discretion of the SoC
 specific framework which uses the OPP library. Similar care needs to be taken
@@ -96,24 +96,24 @@ using RCU read locks. The opp_find_freq_{exact,ceil,floor},
 opp_get_{voltage, freq, opp_count} fall into this category.
 
 opp_{add,enable,disable} are updaters which use mutex and implement it's own
-RCU locking mechanisms. opp_init_cpufreq_table acts as an updater and uses
+RCU locking mechanisms. dev_pm_opp_init_cpufreq_table acts as an updater and uses
 mutex to implment RCU updater strategy. These functions should *NOT* be called
 under RCU locks and other contexts that prevent blocking functions in RCU or
 mutex operations from working.
 
 2. Initial OPP List Registration
 ================================
-The SoC implementation calls opp_add function iteratively to add OPPs per
+The SoC implementation calls dev_pm_opp_add function iteratively to add OPPs per
 device. It is expected that the SoC framework will register the OPP entries
 optimally- typical numbers range to be less than 5. The list generated by
 registering the OPPs is maintained by OPP library throughout the device
 operation. The SoC framework can subsequently control the availability of the
-OPPs dynamically using the opp_enable / disable functions.
+OPPs dynamically using the dev_pm_opp_enable / disable functions.
 
-opp_add - Add a new OPP for a specific domain represented by the device pointer.
+dev_pm_opp_add - Add a new OPP for a specific domain represented by the device pointer.
         The OPP is defined using the frequency and voltage. Once added, the OPP
         is assumed to be available and control of it's availability can be done
-        with the opp_enable/disable functions. OPP library internally stores
+        with the dev_pm_opp_enable/disable functions. OPP library internally stores
         and manages this information in the opp struct. This function may be
         used by SoC framework to define a optimal list as per the demands of
         SoC usage environment.
@@ -124,7 +124,7 @@ opp_add - Add a new OPP for a specific domain represented by the device pointer.
          soc_pm_init()
          {
                 /* Do things */
-                r = opp_add(mpu_dev, 1000000, 900000);
+                r = dev_pm_opp_add(mpu_dev, 1000000, 900000);
                 if (!r) {
                         pr_err("%s: unable to register mpu opp(%d)\n", r);
                         goto no_cpufreq;
@@ -143,44 +143,44 @@ functions return the matching pointer representing the opp if a match is
 found, else returns error. These errors are expected to be handled by standard
 error checks such as IS_ERR() and appropriate actions taken by the caller.
 
-opp_find_freq_exact - Search for an OPP based on an *exact* frequency and
+dev_pm_opp_find_freq_exact - Search for an OPP based on an *exact* frequency and
         availability. This function is especially useful to enable an OPP which
         is not available by default.
         Example: In a case when SoC framework detects a situation where a
         higher frequency could be made available, it can use this function to
-        find the OPP prior to call the opp_enable to actually make it available.
+        find the OPP prior to call the dev_pm_opp_enable to actually make it available.
          rcu_read_lock();
-         opp = opp_find_freq_exact(dev, 1000000000, false);
+         opp = dev_pm_opp_find_freq_exact(dev, 1000000000, false);
          rcu_read_unlock();
          /* dont operate on the pointer.. just do a sanity check.. */
          if (IS_ERR(opp)) {
                 pr_err("frequency not disabled!\n");
                 /* trigger appropriate actions.. */
          } else {
-                opp_enable(dev,1000000000);
+                dev_pm_opp_enable(dev,1000000000);
          }
 
         NOTE: This is the only search function that operates on OPPs which are
         not available.
 
-opp_find_freq_floor - Search for an available OPP which is *at most* the
+dev_pm_opp_find_freq_floor - Search for an available OPP which is *at most* the
         provided frequency. This function is useful while searching for a lesser
         match OR operating on OPP information in the order of decreasing
         frequency.
         Example: To find the highest opp for a device:
          freq = ULONG_MAX;
          rcu_read_lock();
-         opp_find_freq_floor(dev, &freq);
+         dev_pm_opp_find_freq_floor(dev, &freq);
          rcu_read_unlock();
 
-opp_find_freq_ceil - Search for an available OPP which is *at least* the
+dev_pm_opp_find_freq_ceil - Search for an available OPP which is *at least* the
         provided frequency. This function is useful while searching for a
         higher match OR operating on OPP information in the order of increasing
         frequency.
         Example 1: To find the lowest opp for a device:
          freq = 0;
          rcu_read_lock();
-         opp_find_freq_ceil(dev, &freq);
+         dev_pm_opp_find_freq_ceil(dev, &freq);
          rcu_read_unlock();
         Example 2: A simplified implementation of a SoC cpufreq_driver->target:
          soc_cpufreq_target(..)
@@ -188,7 +188,7 @@ opp_find_freq_ceil - Search for an available OPP which is *at least* the
                 /* Do stuff like policy checks etc. */
                 /* Find the best frequency match for the req */
                 rcu_read_lock();
-                opp = opp_find_freq_ceil(dev, &freq);
+                opp = dev_pm_opp_find_freq_ceil(dev, &freq);
                 rcu_read_unlock();
                 if (!IS_ERR(opp))
                         soc_switch_to_freq_voltage(freq);
@@ -208,34 +208,34 @@ as thermal considerations (e.g. don't use OPPx until the temperature drops).
 
 WARNING: Do not use these functions in interrupt context.
 
-opp_enable - Make a OPP available for operation.
+dev_pm_opp_enable - Make a OPP available for operation.
         Example: Lets say that 1GHz OPP is to be made available only if the