Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block

[mirror_ubuntu-bionic-kernel.git] / drivers / cpuidle / cpuidle.c

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 60bb64f4329da292f3eeac6846f4bf6fb179cbb9..484cc8909d5c3630c197ae58ee4c98d2807f42c7 100644 (file)
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -77,7 +77,7 @@ static int find_deepest_state(struct cpuidle_driver *drv,
                              struct cpuidle_device *dev,
                              unsigned int max_latency,
                              unsigned int forbidden_flags,
-                             bool freeze)
+                             bool s2idle)
 {
        unsigned int latency_req = 0;
        int i, ret = 0;
@@ -89,7 +89,7 @@ static int find_deepest_state(struct cpuidle_driver *drv,
                if (s->disabled || su->disable || s->exit_latency <= latency_req
                    || s->exit_latency > max_latency
                    || (s->flags & forbidden_flags)
-                   || (freeze && !s->enter_freeze))
+                   || (s2idle && !s->enter_s2idle))
                        continue;
 
                latency_req = s->exit_latency;
@@ -128,7 +128,7 @@ int cpuidle_find_deepest_state(struct cpuidle_driver *drv,
 }
 
 #ifdef CONFIG_SUSPEND
-static void enter_freeze_proper(struct cpuidle_driver *drv,
+static void enter_s2idle_proper(struct cpuidle_driver *drv,
                                struct cpuidle_device *dev, int index)
 {
        /*
@@ -143,7 +143,7 @@ static void enter_freeze_proper(struct cpuidle_driver *drv,
         * suspended is generally unsafe.
         */
        stop_critical_timings();
-       drv->states[index].enter_freeze(dev, drv, index);
+       drv->states[index].enter_s2idle(dev, drv, index);
        WARN_ON(!irqs_disabled());
        /*
         * timekeeping_resume() that will be called by tick_unfreeze() for the
@@ -155,25 +155,25 @@ static void enter_freeze_proper(struct cpuidle_driver *drv,
 }
 
 /**
- * cpuidle_enter_freeze - Enter an idle state suitable for suspend-to-idle.
+ * cpuidle_enter_s2idle - Enter an idle state suitable for suspend-to-idle.
  * @drv: cpuidle driver for the given CPU.
  * @dev: cpuidle device for the given CPU.
  *
- * If there are states with the ->enter_freeze callback, find the deepest of
+ * If there are states with the ->enter_s2idle callback, find the deepest of
  * them and enter it with frozen tick.
  */
-int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev)
+int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev)
 {
        int index;
 
        /*
-        * Find the deepest state with ->enter_freeze present, which guarantees
+        * Find the deepest state with ->enter_s2idle present, which guarantees
         * that interrupts won't be enabled when it exits and allows the tick to
         * be frozen safely.
         */
        index = find_deepest_state(drv, dev, UINT_MAX, 0, true);
        if (index > 0)
-               enter_freeze_proper(drv, dev, index);
+               enter_s2idle_proper(drv, dev, index);
 
        return index;
 }