ACPI / idle: remove unused definition
PATCH 1/4 ACPI / idle: remove unused definition
The different definitions are not used anywhere in the code.
--- drivers/acpi/processor_idle.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/acpi/processor_idle.c +0 -5
@@ -64,11 +64,6 @@#define ACPI_PROCESSOR_CLASS "processor"#define _COMPONENT ACPI_PROCESSOR_COMPONENTACPI_MODULE_NAME ("processor_idle" ); -#define PM_TIMER_TICK_NS (1000000000ULL/ACPI_PM_TIMER_FREQUENCY) -#define C2_OVERHEAD 1/* 1us */ -#define C3_OVERHEAD 1/* 1us */ -#define PM_TIMER_TICKS_TO_US (p) \ - (((p) * 1000)/(ACPI_PM_TIMER_FREQUENCY/1000))static unsigned int max_cstate__read_mostly =ACPI_PROCESSOR_MAX_POWER ;module_param (max_cstate, uint,0000 );
Signature · 1 line
1.7.9.5
PATCH 2/4 ACPI / idle : remove pointless headers
These different headers are not needed.
--- drivers/acpi/processor_idle.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/acpi/processor_idle.c +1 -12
@@ -28,19 +28,12 @@* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include <linux/kernel.h> #include <linux/module.h> -#include <linux/init.h> -#include <linux/cpufreq.h> -#include <linux/slab.h> #include <linux/acpi.h> #include <linux/dmi.h> -#include <linux/moduleparam.h> -#include <linux/sched.h> /* need_resched() */ -#include <linux/pm_qos.h> +#include <linux/sched.h> /* need_resched() */ #include <linux/clockchips.h> #include <linux/cpuidle.h> -#include <linux/irqflags.h> /* * Include the apic definitions for x86 to have the APIC timer related defines
@@ -52,12 +45,8 @@#include <asm/apic.h> #endif -#include <asm/io.h> -#include <asm/uaccess.h> -#include <acpi/acpi_bus.h> #include <acpi/processor.h> -#include <asm/processor.h> #define PREFIX "ACPI: "
Signature · 1 line
1.7.9.5
PATCH 3/4 ACPI / idle: pass the cpuidle_device parameter
In reply to Daniel LezcanoThe cpuidle_device is retrieved in the function by using directly the global variable. But the caller of this function already have this device and it can be passed as a parameter. That is one small step to encapsulate the code more.
--- drivers/acpi/processor_idle.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/acpi/processor_idle.c +6 -5
@@ -928,13 +928,14 @@ struct cpuidle_driver acpi_idle_driver = {* device i.e. per-cpu data * * @pr: the ACPI processor +* @dev : the cpuidle device */ -static int acpi_processor_setup_cpuidle_cx (struct acpi_processor *pr) +static int acpi_processor_setup_cpuidle_cx (struct acpi_processor *pr, +struct cpuidle_device *dev) {int i, count =CPUIDLE_DRIVER_STATE_START ;struct acpi_processor_cx *cx;struct cpuidle_state_usage *state_usage; -struct cpuidle_device *dev =per_cpu (acpi_cpuidle_device, pr->id);if (!pr->flags.power_setup_done)return -EINVAL ;
@@ -1089,7 +1090,7 @@ int acpi_processor_hotplug(struct acpi_processor *pr)cpuidle_disable_device (dev);acpi_processor_get_power_info (pr);if (pr->flags.power) { -acpi_processor_setup_cpuidle_cx (pr); +acpi_processor_setup_cpuidle_cx (pr, dev); ret =cpuidle_enable_device (dev); }cpuidle_resume_and_unlock ();
@@ -1147,8 +1148,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)continue ;acpi_processor_get_power_info (_pr);if (_pr->flags.power) { -acpi_processor_setup_cpuidle_cx (_pr); dev =per_cpu (acpi_cpuidle_device, cpu); +acpi_processor_setup_cpuidle_cx (_pr, dev);cpuidle_enable_device (dev); } }
@@ -1217,7 +1218,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)return -ENOMEM ;per_cpu (acpi_cpuidle_device, pr->id) = dev; -acpi_processor_setup_cpuidle_cx (pr); +acpi_processor_setup_cpuidle_cx (pr, dev);/* Register per-cpu cpuidle_device. Cpuidle driver * must already be registered before registering device
Signature · 1 line
1.7.9.5
PATCH 4/4 ACPI / idle: remove usage of the statedata
In reply to Daniel LezcanoLen Brown sent a patch to remove this field in the intel_idle driver. The other user of this field is the davinci cpuidle driver and a patch has been sent to remove the usage of it.
This patch removes the last user of this field.
--- drivers/acpi/processor_idle.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/acpi/processor_idle.c +7 -12
@@ -66,6 +66,8 @@ module_param(latency_factor, uint, 0644); static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device); +static struct acpi_processor_cx *acpi_cstate[CPUIDLE_STATE_MAX ]; +static int disabled_by_idle_boot_param (void ) { return boot_option_idle_override == IDLE_POLL ||
@@ -721,8 +723,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) {struct acpi_processor *pr; -struct cpuidle_state_usage *state_usage = &dev->states_usage[index]; -struct acpi_processor_cx *cx =cpuidle_get_statedata (state_usage); +struct acpi_processor_cx *cx = acpi_cstate[index]; pr =__this_cpu_read (processors);
@@ -745,8 +746,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,*/ static int acpi_idle_play_dead (struct cpuidle_device *dev,int index) { -struct cpuidle_state_usage *state_usage = &dev->states_usage[index]; -struct acpi_processor_cx *cx =cpuidle_get_statedata (state_usage); +struct acpi_processor_cx *cx = acpi_cstate[index];ACPI_FLUSH_CPU_CACHE ();
@@ -776,8 +776,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) {struct acpi_processor *pr; -struct cpuidle_state_usage *state_usage = &dev->states_usage[index]; -struct acpi_processor_cx *cx =cpuidle_get_statedata (state_usage); +struct acpi_processor_cx *cx = acpi_cstate[index]; pr =__this_cpu_read (processors);
@@ -835,8 +834,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) {struct acpi_processor *pr; -struct cpuidle_state_usage *state_usage = &dev->states_usage[index]; -struct acpi_processor_cx *cx =cpuidle_get_statedata (state_usage); +struct acpi_processor_cx *cx = acpi_cstate[index]; pr =__this_cpu_read (processors);
@@ -935,7 +933,6 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr, {int i, count =CPUIDLE_DRIVER_STATE_START ;struct acpi_processor_cx *cx; -struct cpuidle_state_usage *state_usage;if (!pr->flags.power_setup_done)return -EINVAL ;
@@ -954,7 +951,6 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,for (i =1 ; i <ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) { cx = &pr->power.states[i]; - state_usage = &dev->states_usage[count];if (!cx->valid)continue ;
@@ -965,8 +961,7 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr, !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) continue;#endif - -cpuidle_set_statedata (state_usage, cx); + acpi_cstate[count] = cx; count++;if (count ==CPUIDLE_STATE_MAX )
Signature · 1 line
1.7.9.5
Len Brown
reviewerseries applied.
thanks,
Len Brown, Intel Open Source Technology Center