[PATCH] intel_idle: remove a couple of useless variables

Artem Bityutskiy
2021-09-24T07:59:24Z

From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

This patch is a cleanup and has no functional impact.

Remove the 'auto_demotion_disable_flags' and 'disable_promotion_to_c1e' global
variables because we already have them in the global 'icpu' structure. Other
'icpu' members like 'use_acpi' are not duplicated, and it's better to be
consistent on this. Consistency improves readability.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---
drivers/idle/intel_idle.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 70c2237a7261..eb28c3059351 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -67,9 +67,6 @@ static unsigned int disabled_states_mask;

static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;

-static unsigned long auto_demotion_disable_flags;
-static bool disable_promotion_to_c1e;
-
struct idle_cpu {
struct cpuidle_state *state_table;

@@ -1644,7 +1641,7 @@ static void auto_demotion_disable(void)
unsigned long long msr_bits;

rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
- msr_bits &= ~auto_demotion_disable_flags;
+ msr_bits &= ~icpu->auto_demotion_disable_flags;
wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
}

@@ -1676,10 +1673,10 @@ static int intel_idle_cpu_init(unsigned int cpu)
return -EIO;
}

- if (auto_demotion_disable_flags)
+ if (icpu->auto_demotion_disable_flags)
auto_demotion_disable();

- if (disable_promotion_to_c1e)
+ if (icpu->disable_promotion_to_c1e)
c1e_promotion_disable();

return 0;
@@ -1757,8 +1754,6 @@ static int __init intel_idle_init(void)
icpu = (const struct idle_cpu *)id->driver_data;
if (icpu) {
cpuidle_state_table = icpu->state_table;
- auto_demotion_disable_flags = icpu->auto_demotion_disable_flags;
- disable_promotion_to_c1e = icpu->disable_promotion_to_c1e;
if (icpu->use_acpi || force_use_acpi)
intel_idle_acpi_cst_extract();
} else if (!intel_idle_acpi_cst_extract()) {
--
2.31.1