PM: EM: update the comments related to power scale

The Energy Model supports power values expressed in milli-Watts or in an
'abstract scale'. Update the related comments is the code to reflect that
state.

Reviewed-by: Quentin Perret <qperret@google.com>
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
index 3a33c73..9618c0a 100644 (file)
--- a/include/linux/energy_model.h
+++ b/include/linux/energy_model.h
@@ -13,9 +13,8 @@
 /**
  * em_perf_state - Performance state of a performance domain
  * @frequency: The frequency in KHz, for consistency with CPUFreq
- * @power:     The power consumed at this level, in milli-watts (by 1 CPU or
-               by a registered device). It can be a total power: static and
-               dynamic.
+ * @power:     The power consumed at this level (by 1 CPU or by a registered
+ *             device). It can be a total power: static and dynamic.
  * @cost:      The cost coefficient associated with this level, used during
  *             energy calculation. Equal to: power * max_frequency / frequency
  */
@@ -58,7 +57,7 @@ struct em_data_callback {
        /**
         * active_power() - Provide power at the next performance state of
         *              a device
-        * @power       : Active power at the performance state in mW
+        * @power       : Active power at the performance state
         *              (modified)
         * @freq        : Frequency at the performance state in kHz
         *              (modified)
@@ -69,8 +68,8 @@ struct em_data_callback {
         * and frequency.
         *
         * In case of CPUs, the power is the one of a single CPU in the domain,
-        * expressed in milli-watts. It is expected to fit in the
-        * [0, EM_MAX_POWER] range.
+        * expressed in milli-Watts or an abstract scale. It is expected to
+        * fit in the [0, EM_MAX_POWER] range.
         *
         * Return 0 on success.
         */

diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index efe2a59..1358fa4 100644 (file)
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -143,7 +143,7 @@ static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd,
 
                /*
                 * The power returned by active_state() is expected to be
-                * positive, in milli-watts and to fit into 16 bits.
+                * positive and to fit into 16 bits.
                 */
                if (!power || power > EM_MAX_POWER) {
                        dev_err(dev, "EM: invalid power: %lu\n",