cpuidle: menu: Get rid of first_idx from menu_select()

Rearrange the code in menu_select() so that the loop over idle states
always starts from 0 and get rid of the first_idx variable.

While at it, add two empty lines to separate conditional statements
from one another.

No intentional behavior changes.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 98a39c5..5c7fafc 100644 (file)
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -285,7 +285,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
        struct menu_device *data = this_cpu_ptr(&menu_devices);
        int latency_req = cpuidle_governor_latency_req(dev->cpu);
        int i;
-       int first_idx;
        int idx;
        unsigned int interactivity_req;
        unsigned int expected_interval;
@@ -348,36 +347,33 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                        latency_req = interactivity_req;
        }
 
-       first_idx = 0;
-       if (drv->states[0].flags & CPUIDLE_FLAG_POLLING) {
-               struct cpuidle_state *s = &drv->states[1];
-               unsigned int polling_threshold;
-
-               /*
-                * Default to a physical idle state, not to busy polling, unless
-                * a timer is going to trigger really really soon.
-                */
-               polling_threshold = max_t(unsigned int, 20, s->target_residency);
-               if (data->next_timer_us > polling_threshold &&
-                   latency_req > s->exit_latency && !s->disabled &&
-                   !dev->states_usage[1].disable)
-                       first_idx = 1;
-       }
-
        /*
         * Find the idle state with the lowest power while satisfying
         * our constraints.
         */
        idx = -1;
-       for (i = first_idx; i < drv->state_count; i++) {
+       for (i = 0; i < drv->state_count; i++) {
                struct cpuidle_state *s = &drv->states[i];
                struct cpuidle_state_usage *su = &dev->states_usage[i];
 
                if (s->disabled || su->disable)
                        continue;
+
                if (idx == -1)
                        idx = i; /* first enabled state */
+
                if (s->target_residency > predicted_us) {
+                       /*
+                        * Use a physical idle state, not busy polling, unless
+                        * a timer is going to trigger really really soon.
+                        */
+                       if ((drv->states[idx].flags & CPUIDLE_FLAG_POLLING) &&
+                           i == idx + 1 && latency_req > s->exit_latency &&
+                           data->next_timer_us > max_t(unsigned int, 20,
+                                                       s->target_residency)) {
+                               idx = i;
+                               break;
+                       }
                        if (predicted_us < TICK_USEC)
                                break;