Skip to content

Commit 1abffbd

Browse files
dedekindrafaeljw
authored andcommitted
intel_idle: further intel_idle_init_cstates_icpu() cleanup
Introduce a temporary 'state' variable for referencing the currently processed C-state in the intel_idle_init_cstates_icpu() function. This makes code lines shorter and easier to read. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Reviewed-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent a78032e commit 1abffbd

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

drivers/idle/intel_idle.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1871,6 +1871,7 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)
18711871
}
18721872

18731873
for (cstate = 0; cstate < CPUIDLE_STATE_MAX; ++cstate) {
1874+
struct cpuidle_state *state;
18741875
unsigned int mwait_hint;
18751876

18761877
if (intel_idle_max_cstate_reached(cstate))
@@ -1893,29 +1894,30 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)
18931894

18941895
/* Structure copy. */
18951896
drv->states[drv->state_count] = cpuidle_state_table[cstate];
1897+
state = &drv->states[drv->state_count];
18961898

1897-
if ((drv->states[drv->state_count].flags & CPUIDLE_FLAG_IRQ_ENABLE) || force_irq_on) {
1899+
if ((state->flags & CPUIDLE_FLAG_IRQ_ENABLE) || force_irq_on) {
18981900
pr_info("forced intel_idle_irq for state %d\n", cstate);
1899-
drv->states[drv->state_count].enter = intel_idle_irq;
1901+
state->enter = intel_idle_irq;
19001902
}
19011903

19021904
if (cpu_feature_enabled(X86_FEATURE_KERNEL_IBRS) &&
1903-
drv->states[drv->state_count].flags & CPUIDLE_FLAG_IBRS) {
1904-
WARN_ON_ONCE(drv->states[drv->state_count].flags & CPUIDLE_FLAG_IRQ_ENABLE);
1905-
drv->states[drv->state_count].enter = intel_idle_ibrs;
1905+
state->flags & CPUIDLE_FLAG_IBRS) {
1906+
WARN_ON_ONCE(state->flags & CPUIDLE_FLAG_IRQ_ENABLE);
1907+
state->enter = intel_idle_ibrs;
19061908
}
19071909

1908-
if (drv->states[drv->state_count].flags & CPUIDLE_FLAG_INIT_XSTATE)
1909-
drv->states[drv->state_count].enter = intel_idle_xstate;
1910+
if (state->flags & CPUIDLE_FLAG_INIT_XSTATE)
1911+
state->enter = intel_idle_xstate;
19101912

19111913
if ((disabled_states_mask & BIT(drv->state_count)) ||
19121914
((icpu->use_acpi || force_use_acpi) &&
19131915
intel_idle_off_by_default(mwait_hint) &&
1914-
!(drv->states[drv->state_count].flags & CPUIDLE_FLAG_ALWAYS_ENABLE)))
1915-
drv->states[drv->state_count].flags |= CPUIDLE_FLAG_OFF;
1916+
!(state->flags & CPUIDLE_FLAG_ALWAYS_ENABLE)))
1917+
state->flags |= CPUIDLE_FLAG_OFF;
19161918

1917-
if (intel_idle_state_needs_timer_stop(&drv->states[drv->state_count]))
1918-
drv->states[drv->state_count].flags |= CPUIDLE_FLAG_TIMER_STOP;
1919+
if (intel_idle_state_needs_timer_stop(state))
1920+
state->flags |= CPUIDLE_FLAG_TIMER_STOP;
19191921

19201922
drv->state_count++;
19211923
}

0 commit comments

Comments
 (0)