cpuidle: teo: Combine candidate state index checks against 0

There are two candidate state index checks against 0 in teo_select()
that need not be separate, so combine them and update comments around
them.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Christian Loehle <christian.loehle@arm.com>
Tested-by: Aboorva Devarajan <aboorvad@linux.ibm.com>
Tested-by: Christian Loehle <christian.loehle@arm.com>
Link: https://patch.msgid.link/13676346.uLZWGnKmhe@rjwysocki.net

diff --git a/drivers/cpuidle/governors/teo.c b/drivers/cpuidle/governors/teo.c
index 30e444c9c40b0b6a5a60667822397b65bf0e1470..bd2fe41b4287303f595ff18f15a17bf50372eba5 100644 (file)
--- a/drivers/cpuidle/governors/teo.c
+++ b/drivers/cpuidle/governors/teo.c
@@ -436,23 +436,18 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
        if (idx > constraint_idx)
                idx = constraint_idx;
 
-       if (!idx && prev_intercept_idx) {
-               /*
-                * We have to query the sleep length here otherwise we don't
-                * know after wakeup if our guess was correct.
-                */
-               duration_ns = tick_nohz_get_sleep_length(&delta_tick);
-               cpu_data->sleep_length_ns = duration_ns;
+       if (!idx) {
+               if (prev_intercept_idx) {
+                       /*
+                        * Query the sleep length to be able to count the wakeup
+                        * as a hit if it is caused by a timer.
+                        */
+                       duration_ns = tick_nohz_get_sleep_length(&delta_tick);
+                       cpu_data->sleep_length_ns = duration_ns;
+               }
                goto out_tick;
        }
 
-       /*
-        * Skip the timers check if state 0 is the current candidate one,
-        * because an immediate non-timer wakeup is expected in that case.
-        */
-       if (!idx)
-               goto out_tick;
-
        /*
         * If state 0 is a polling one, check if the target residency of
         * the current candidate state is low enough and skip the timers