cpuidle: teo: Drop utilized from struct teo_cpu
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 31 Jul 2023 19:04:41 +0000 (21:04 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2023 20:37:11 +0000 (22:37 +0200)
Because the utilized field in struct teo_cpu is only used locally in
teo_select(), replace it with a local variable in that function.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-and-tested-by: Kajetan Puchalski <kajetan.puchalski@arm.com>
drivers/cpuidle/governors/teo.c

index 1b76db3..3915e56 100644 (file)
@@ -187,7 +187,6 @@ struct teo_bin {
  * @next_recent_idx: Index of the next @recent_idx entry to update.
  * @recent_idx: Indices of bins corresponding to recent "intercepts".
  * @util_threshold: Threshold above which the CPU is considered utilized
- * @utilized: Whether the last sleep on the CPU happened while utilized
  */
 struct teo_cpu {
        s64 time_span_ns;
@@ -197,7 +196,6 @@ struct teo_cpu {
        int next_recent_idx;
        int recent_idx[NR_RECENT];
        unsigned long util_threshold;
-       bool utilized;
 };
 
 static DEFINE_PER_CPU(struct teo_cpu, teo_cpus);
@@ -366,6 +364,7 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
        int idx0 = 0, idx = -1;
        bool alt_intercepts, alt_recent;
        ktime_t delta_tick;
+       bool cpu_utilized;
        s64 duration_ns;
        int i;
 
@@ -391,13 +390,13 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                        goto out_tick;
        }
 
-       cpu_data->utilized = teo_cpu_is_utilized(dev->cpu, cpu_data);
+       cpu_utilized = teo_cpu_is_utilized(dev->cpu, cpu_data);
        /*
         * If the CPU is being utilized over the threshold and there are only 2
         * states to choose from, the metrics need not be considered, so choose
         * the shallowest non-polling state and exit.
         */
-       if (drv->state_count < 3 && cpu_data->utilized) {
+       if (drv->state_count < 3 && cpu_utilized) {
                /* The CPU is utilized, so assume a short idle duration. */
                duration_ns = teo_middle_of_bin(0, drv);
                /*
@@ -562,7 +561,7 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
         * been stopped already and the shallower state's target residency is
         * not sufficiently large.
         */
-       if (cpu_data->utilized) {
+       if (cpu_utilized) {
                s64 span_ns;
 
                i = teo_find_shallower_state(drv, dev, idx, duration_ns, true);